Updating Java images from OpenJDK to Eclipse Temurin (Azure#187)

aamgayle · Mar 23, 2023 · 19d36ed · 19d36ed
1 parent 0e6790a
commit 19d36ed
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 17 deletions.
diff --git a/template/dockerfiles/clojure/Dockerfile b/template/dockerfiles/clojure/Dockerfile
@@ -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}}

diff --git a/template/dockerfiles/clojure/draft.yaml b/template/dockerfiles/clojure/draft.yaml
@@ -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"

diff --git a/template/dockerfiles/gradle/Dockerfile b/template/dockerfiles/gradle/Dockerfile
@@ -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}}
 

diff --git a/template/dockerfiles/gradle/draft.yaml b/template/dockerfiles/gradle/draft.yaml
@@ -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"
diff --git a/template/dockerfiles/java/Dockerfile b/template/dockerfiles/java/Dockerfile
@@ -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

diff --git a/template/dockerfiles/java/draft.yaml b/template/dockerfiles/java/draft.yaml
@@ -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"
diff --git a/test/integration/gradle/helm.yaml b/test/integration/gradle/helm.yaml
@@ -10,7 +10,7 @@ deployVariables:
     value: "testapp"
 languageVariables:
   - name: "VERSION"
-    value: "11-jre-slim"
+    value: "11-jre"
   - name: "BUILDERVERSION"
     value: "jdk11"
   - name: "PORT"

diff --git a/test/integration/gradle/kustomize.yaml b/test/integration/gradle/kustomize.yaml
@@ -10,7 +10,7 @@ deployVariables:
     value: "testapp"
 languageVariables:
   - name: "VERSION"
-    value: "11-jre-slim"
+    value: "11-jre"
   - name: "BUILDERVERSION"
     value: "jdk11"
   - name: "PORT"

diff --git a/test/integration/gradle/manifest.yaml b/test/integration/gradle/manifest.yaml
@@ -10,7 +10,7 @@ deployVariables:
     value: "testapp"
 languageVariables:
   - name: "VERSION"
-    value: "11-jre-slim"
+    value: "11-jre"
   - name: "BUILDERVERSION"
     value: "jdk11"
   - name: "PORT"

diff --git a/test/integration/java/helm.yaml b/test/integration/java/helm.yaml
@@ -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"

diff --git a/test/integration/java/kustomize.yaml b/test/integration/java/kustomize.yaml
@@ -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"

diff --git a/test/integration/java/manifest.yaml b/test/integration/java/manifest.yaml
@@ -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"

diff --git a/test/integration_config.json b/test/integration_config.json
@@ -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,