Merge branch 'master' into s390x-support

wildfly · May 30, 2024 · d4c29b3 · d4c29b3
2 parents 95e291b + fe29702
commit d4c29b3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -15,7 +15,7 @@ jobs:
   image:
     env:
       # Put the "latest" tag on this JDK version
-      JDK_VERSION_FOR_LATEST: 17
+      JDK_VERSION_FOR_LATEST: 21
     strategy:
       matrix:
         include:
@@ -32,10 +32,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.1.4
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4.1.1
+        uses: docker/metadata-action@v5.5.1
         with:
           images: ${{ secrets.REGISTRY }}/${{ secrets.IMAGE }}
           flavor: |
@@ -47,18 +47,18 @@ jobs:
           labels: |
             org.opencontainers.image.jdk-version=${{ matrix.jdk-version }}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.1.0
+        uses: docker/setup-qemu-action@v3.0.0
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2.2.1
+        uses: docker/setup-buildx-action@v3.3.0
       - name: Docker Login to Quay.io
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v3.1.0
         with:
           registry: ${{ secrets.REGISTRY }}
           username: ${{ secrets.REGISTRY_USER }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
       - name: Build and push JDK images
         id: docker_build
-        uses: docker/build-push-action@v3.2.0
+        uses: docker/build-push-action@v5.3.0
         with:
           push: true
           platforms: ${{ matrix.platforms }}

diff --git a/Dockerfile b/Dockerfile
@@ -1,19 +1,24 @@
 # By default, build on JDK 17 on CentOS 7.
-ARG jdk=17
+ARG jdk=21
 # Red Hat UBI 9 (ubi9-minimal) should be used on JDK 20 and later.
-ARG dist=centos7
+ARG dist=ubi9-minimal
 FROM eclipse-temurin:${jdk}-${dist}
 
 LABEL org.opencontainers.image.source=https://github.com/jboss-dockerfiles/wildfly org.opencontainers.image.title=wildfly org.opencontainers.imag.url=https://github.com/jboss-dockerfiles/wildfly org.opencontainers.image.vendor=WildFly
 
+# Starting on jdk 21 eclipse-temurin is based on ubi9-minimal version 9.3 
+#   that doesn't includes shadow-utils package that provides groupadd & useradd commands
+# Conditional RUN: IF no groupadd AND microdnf THEN: update, install shadow-utils, clean
+RUN if ! [ -x "$(command -v groupadd)" ] && [ -x "$(command -v microdnf)" ]; then microdnf update -y && microdnf install --best --nodocs -y shadow-utils && microdnf clean all; fi
+
 WORKDIR /opt/jboss
 
 RUN groupadd -r jboss -g 1000 && useradd -u 1000 -r -g jboss -m -d /opt/jboss -s /sbin/nologin -c "JBoss user" jboss && \
     chmod 755 /opt/jboss
 
 # Set the WILDFLY_VERSION env variable
-ENV WILDFLY_VERSION 28.0.1.Final
-ENV WILDFLY_SHA1 8702fb7ba8d1249bf058e2223f662e5176b39d0d
+ENV WILDFLY_VERSION 32.0.0.Final
+ENV WILDFLY_SHA1 9b6d762aa4662045fc3e7329a1ed1c0d457daf6d
 ENV JBOSS_HOME /opt/jboss/wildfly
 
 USER root