fixup! Add Java 21

findepi · Sep 23, 2023 · 61fa48a · 61fa48a
1 parent 336c64a
commit 61fa48a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/Dockerfile.native b/Dockerfile.native
@@ -1,6 +1,5 @@
-ARG GRAAL_VERSION
 ARG JDK_VERSION
-FROM findepi/graalvm:${GRAAL_VERSION}-${JDK_VERSION}
+FROM findepi/graalvm:${JDK_VERSION}
 LABEL maintainer="Piotr Findeisen <piotr.findeisen@gmail.com>"
 
 RUN set -xeu && \

diff --git a/Dockerfile.polyglot b/Dockerfile.polyglot
@@ -1,6 +1,5 @@
-ARG GRAAL_VERSION
 ARG JDK_VERSION
-FROM findepi/graalvm:${GRAAL_VERSION}-${JDK_VERSION}-native
+FROM findepi/graalvm:${JDK_VERSION}-native
 LABEL maintainer="Piotr Findeisen <piotr.findeisen@gmail.com>"
 
 RUN set -xeu && \

diff --git a/bin/deploy.sh b/bin/deploy.sh
@@ -6,19 +6,27 @@ set +x -v
 echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 set +v -x
 
-docker push "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}"
-docker push "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-native"
-docker push "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-polyglot"
-docker push "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-all"
+if test -v GRAAL_VERSION; then
+    docker push "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}"
+    docker push "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-native"
+    if [ "${JDK_VERSION}" != "java21" ]; then
+        docker push "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-polyglot"
+    fi
+    docker push "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-all"
+fi
 
 docker push "${IMAGE_NAME}:${JDK_VERSION}"
 docker push "${IMAGE_NAME}:${JDK_VERSION}-native"
-docker push "${IMAGE_NAME}:${JDK_VERSION}-polyglot"
+if [ "${JDK_VERSION}" != "java21" ]; then
+    docker push "${IMAGE_NAME}:${JDK_VERSION}-polyglot"
+fi
 docker push "${IMAGE_NAME}:${JDK_VERSION}-all"
 
 if [ "${DEFAULT_IMAGE}" = "true" ]; then
     docker push "${IMAGE_NAME}:latest"
     docker push "${IMAGE_NAME}:native"
-    docker push "${IMAGE_NAME}:polyglot"
+    if [ "${JDK_VERSION}" != "java21" ]; then
+        docker push "${IMAGE_NAME}:polyglot"
+    fi
     docker push "${IMAGE_NAME}:all"
 fi
diff --git a/bin/test-base.sh b/bin/test-base.sh
@@ -2,7 +2,7 @@
 
 set -xeuo pipefail
 
-image="${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}"
+image="${IMAGE_NAME}:${JDK_VERSION}"
 docker run --rm "${image}" java -version 2>&1
 docker run --rm "${image}" java -version 2>&1 | grep GraalVM
 docker run --rm "${image}" java -version 2>&1 | grep "openjdk version \"${JDK_VERSION#java}."