Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating Java images from OpenJDK to Eclipse Temurin #187

Merged
merged 2 commits into from
Feb 24, 2023
Merged

Updating Java images from OpenJDK to Eclipse Temurin #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38db898
Updating from openjdk
bfoley13 Feb 23, 2023
0be2112
Updating test input
bfoley13 Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion template/dockerfiles/clojure/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ COPY . /usr/src/app
WORKDIR /usr/src/app
RUN lein ring uberjar

FROM openjdk:{{VERSION}}
FROM eclipse-temurin:{{VERSION}}

RUN apk update && apk upgrade && apk add bash
ENV PORT {{PORT}}
Expand Down
2 changes: 1 addition & 1 deletion template/dockerfiles/clojure/draft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ variables:
type: int
- name: "VERSION"
description: "the version of openjdk that the application uses"
exampleValues: ["8-jdk-alpine","11-jdk-alpine"]
exampleValues: ["8-jdk-alpine","11-jdk-alpine","17-jdk-alpine","19-jdk-alpine"]
variableDefaults:
- name: "VERSION"
value: "8-jdk-alpine"
Expand Down
2 changes: 1 addition & 1 deletion template/dockerfiles/gradle/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM gradle:{{BUILDERVERSION}} as BUILD
COPY --chown=gradle:gradle . /project
RUN gradle -i -s -b /project/build.gradle clean build

FROM openjdk:{{VERSION}}
FROM eclipse-temurin:{{VERSION}}
ENV PORT {{PORT}}
EXPOSE {{PORT}}

Expand Down
6 changes: 3 additions & 3 deletions template/dockerfiles/gradle/draft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ variables:
type: int
- name: "BUILDERVERSION"
description: "the version of gradle used during the builder stage to generate the executable"
exampleValues: ["jdk11"]
exampleValues: ["jdk8","jdk11","jdk17","jdk19"]
- name: "VERSION"
description: "the version of openjdk used by the application"
exampleValues: ["11-jre-slim"]
exampleValues: ["8-jre","11-jre","17-jre","19-jre"]
variableDefaults:
- name: "BUILDERVERSION"
value: "jdk11"
- name: "VERSION"
value: "11-jre-slim"
value: "11-jre"
- name: "PORT"
value: "80"
2 changes: 1 addition & 1 deletion template/dockerfiles/java/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM maven:{{BUILDERVERSION}} as BUILD
COPY . /usr/src/app
RUN mvn --batch-mode -f /usr/src/app/pom.xml clean package

FROM openjdk:{{VERSION}}
FROM eclipse-temurin:{{VERSION}}
ENV PORT {{PORT}}
EXPOSE {{PORT}}
COPY --from=BUILD /usr/src/app/target /opt/target
Expand Down
4 changes: 2 additions & 2 deletions template/dockerfiles/java/draft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ variables:
exampleValues: ["3-jdk-11"]
- name: "VERSION"
description: "the version of openjdk used by the application"
exampleValues: ["11-jre-slim"]
exampleValues: ["8-jre","11-jre","17-jre","19-jre"]
variableDefaults:
- name: "BUILDERVERSION"
value: "3-jdk-11"
- name: "VERSION"
value: "11-jre-slim"
value: "11-jre"
- name: "PORT"
value: "80"
2 changes: 1 addition & 1 deletion test/integration/gradle/helm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ deployVariables:
value: "testapp"
languageVariables:
- name: "VERSION"
value: "11-jre-slim"
value: "11-jre"
- name: "BUILDERVERSION"
value: "jdk11"
- name: "PORT"
Expand Down
2 changes: 1 addition & 1 deletion test/integration/gradle/kustomize.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ deployVariables:
value: "testapp"
languageVariables:
- name: "VERSION"
value: "11-jre-slim"
value: "11-jre"
- name: "BUILDERVERSION"
value: "jdk11"
- name: "PORT"
Expand Down
2 changes: 1 addition & 1 deletion test/integration/gradle/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ deployVariables:
value: "testapp"
languageVariables:
- name: "VERSION"
value: "11-jre-slim"
value: "11-jre"
- name: "BUILDERVERSION"
value: "jdk11"
- name: "PORT"
Expand Down
2 changes: 1 addition & 1 deletion test/integration/java/helm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ deployVariables:
value: "testapp"
languageVariables:
- name: "VERSION"
value: "11-jre-slim"
value: "11-jre"
- name: "BUILDERVERSION"
value: "3-jdk-11"
- name: "PORT"
Expand Down
2 changes: 1 addition & 1 deletion test/integration/java/kustomize.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ deployVariables:
value: "testapp"
languageVariables:
- name: "VERSION"
value: "11-jre-slim"
value: "11-jre"
- name: "BUILDERVERSION"
value: "3-jdk-11"
- name: "PORT"
Expand Down
2 changes: 1 addition & 1 deletion test/integration/java/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ deployVariables:
value: "testapp"
languageVariables:
- name: "VERSION"
value: "11-jre-slim"
value: "11-jre"
- name: "BUILDERVERSION"
value: "3-jdk-11"
- name: "PORT"
Expand Down
4 changes: 2 additions & 2 deletions test/integration_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@
},
{
"language": "java",
"version": "11-jre-slim",
"version": "11-jre",
"builderversion": "3-jdk-11",
"port": "8080",
"serviceport": 80,
"repo": "imiller31/simple-java-server"
},
{
"language": "gradle",
"version": "11-jre-slim",
"version": "11-jre",
"builderversion": "jdk11",
"port": "8080",
"serviceport": 80,
Expand Down