HAL-1894: Change JVM for WildFly images to 11

hal · Nov 9, 2023 · 77db04e · 77db04e
1 parent c67fbce
commit 77db04e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/wildfly/build-wildfly.sh b/wildfly/build-wildfly.sh
@@ -175,17 +175,17 @@ else
   if [[ "$WILDFLY_MAJOR_VERSION" -lt "24" ]]; then
     BASE=docker.io/jboss/wildfly
   fi
-  # Use JDK17 for for WildFly 27 and above
+  # Use JDK suffix for for WildFly 27 and above
   if [[ "$WILDFLY_MAJOR_VERSION" -gt "26" ]]; then
-    WILDFLY_VERSION=$WILDFLY_VERSION-jdk17
+    WILDFLY_VERSION=$WILDFLY_VERSION-jdk11
   fi
 
   msg
   msg "Build WildFly ${CYAN}standalone${NOFORMAT} ${YELLOW}${WILDFLY_VERSION}${NOFORMAT}"
   ${DOCKER} build \
     --platform linux/amd64 \
     --build-arg WILDFLY_VERSION="${WILDFLY_VERSION}" \
-    --build-arg DOCKER_BASE="${BASE}" \
+    --build-arg WILDFLY_BASE="${BASE}" \
     --file src/main/docker/Dockerfile-standalone \
     --tag "${TAG}:${TAG_VERSION}" \
     .
@@ -195,7 +195,7 @@ else
   ${DOCKER} build \
     --platform linux/amd64 \
     --build-arg WILDFLY_VERSION="${WILDFLY_VERSION}" \
-    --build-arg DOCKER_BASE="${BASE}" \
+    --build-arg WILDFLY_BASE="${BASE}" \
     --file src/main/docker/Dockerfile-domain \
     --tag "${TAG_DOMAIN}:${TAG_VERSION}" \
     .

diff --git a/wildfly/src/main/docker/Dockerfile-domain b/wildfly/src/main/docker/Dockerfile-domain
@@ -15,8 +15,8 @@
 #
 
 ARG WILDFLY_VERSION=latest
-ARG DOCKER_BASE=jboss/wildfly
-FROM ${DOCKER_BASE}:${WILDFLY_VERSION}
+ARG WILDFLY_BASE=jboss/wildfly
+FROM ${WILDFLY_BASE}:${WILDFLY_VERSION}
 
 LABEL maintainer="Harald Pehl <[email protected]>"
 

diff --git a/wildfly/src/main/docker/Dockerfile-domain-development b/wildfly/src/main/docker/Dockerfile-domain-development
@@ -22,7 +22,6 @@ ENV JBOSS_HOME /opt/jboss/wildfly
 ARG WILDFLY_VERSION
 COPY wildfly-${WILDFLY_VERSION}.tar.gz /
 
-
 USER root
 ARG WILDFLY_VERSION
 RUN tar xf /wildfly-${WILDFLY_VERSION}.tar.gz --directory=/ \

diff --git a/wildfly/src/main/docker/Dockerfile-standalone b/wildfly/src/main/docker/Dockerfile-standalone
@@ -15,8 +15,8 @@
 #
 
 ARG WILDFLY_VERSION=latest
-ARG DOCKER_BASE=jboss/wildfly
-FROM ${DOCKER_BASE}:${WILDFLY_VERSION}
+ARG WILDFLY_BASE=jboss/wildfly
+FROM ${WILDFLY_BASE}:${WILDFLY_VERSION}
 
 LABEL maintainer="Harald Pehl <[email protected]>"