Skip to content

Commit

Permalink
Merge pull request #192 from jmesnil/jdk_21
Browse files Browse the repository at this point in the history
Switch latest tag to JDK 21 variant
  • Loading branch information
jmesnil authored Apr 29, 2024
2 parents 5ae874a + 0950899 commit 6f7b69d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ jobs:
image:
env:
# Put the "latest" tag on this JDK version
JDK_VERSION_FOR_LATEST: 17
JDK_VERSION_FOR_LATEST: 21
strategy:
matrix:
include:
- jdk-version: 11
dist: centos7
- jdk-version: 17
dist: centos7
- jdk-version: 20
- jdk-version: 21
dist: ubi9-minimal
environment: quay.io
runs-on: ubuntu-latest
Expand Down
9 changes: 7 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
# 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 && \
Expand Down

0 comments on commit 6f7b69d

Please sign in to comment.