Fix unversioned images

They were not getting updated. Scripts where using `DEFAULT` and ci.yml `DEFAULT_IMAGE`.
findepi · Sep 23, 2023 · 7205984 · 7205984
1 parent 1e6c71b
commit 7205984
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/bin/build.sh b/bin/build.sh
@@ -37,7 +37,7 @@ docker tag "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-polyglot" "${IMAGE_NAM
 docker tag "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-polyglot" "${IMAGE_NAME}:${JDK_VERSION}-polyglot"
 docker tag "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-polyglot" "${IMAGE_NAME}:${JDK_VERSION}-all"
 
-if [ "${DEFAULT}" = "true" ]; then
+if [ "${DEFAULT_IMAGE}" = "true" ]; then
     docker tag "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}" "${IMAGE_NAME}:latest"
     docker tag "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-native" "${IMAGE_NAME}:native"
     docker tag "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-polyglot" "${IMAGE_NAME}:polyglot"

diff --git a/bin/deploy.sh b/bin/deploy.sh
@@ -16,7 +16,7 @@ docker push "${IMAGE_NAME}:${JDK_VERSION}-native"
 docker push "${IMAGE_NAME}:${JDK_VERSION}-polyglot"
 docker push "${IMAGE_NAME}:${JDK_VERSION}-all"
 
-if [ "${DEFAULT}" = "true" ]; then
+if [ "${DEFAULT_IMAGE}" = "true" ]; then
     docker push "${IMAGE_NAME}:latest"
     docker push "${IMAGE_NAME}:native"
     docker push "${IMAGE_NAME}:polyglot"

diff --git a/settings.sh b/settings.sh
@@ -3,7 +3,7 @@
 export IMAGE_NAME=findepi/graalvm # by necessity, this is also set in derived images' FROM directive
 export GRAAL_VERSION="23.0.1"
 export JDK_VERSION="${JDK_VERSION-java17}"
-export DEFAULT="${DEFAULT-false}"
+export DEFAULT_IMAGE="${DEFAULT_IMAGE-false}"
 
 if [ "${JDK_VERSION}" = "java17" ]; then
     GRAAL_JDK_VERSION="17.0.8"