From 0c6b60497b004afcc28038ee806be0ee1baa6fb2 Mon Sep 17 00:00:00 2001 From: Jeff Mesnil Date: Thu, 26 Sep 2024 14:18:32 +0200 Subject: [PATCH] Update ENV instructions Signed-off-by: Jeff Mesnil --- .github/workflows/publish-release.yml | 2 +- Dockerfile | 8 ++++---- scripts/smoke-test.sh | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index d2ae570..a796f65 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -1,4 +1,4 @@ -name: Build and push WildFly Docker images +name: Build WildFly Docker images # This action requires 4 secrets: # secrets.REGISTRY - the container registry (e.g. quay.io) diff --git a/Dockerfile b/Dockerfile index 28160cf..db5a088 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,9 +17,9 @@ RUN groupadd -r jboss -g 1000 && useradd -u 1000 -r -g jboss -m -d /opt/jboss -s chmod 755 /opt/jboss # Set the WILDFLY_VERSION env variable -ENV WILDFLY_VERSION 33.0.2.Final -ENV WILDFLY_SHA1 a42e8cb6a83931a8f85c7064cb7220e16c6dc0c9 -ENV JBOSS_HOME /opt/jboss/wildfly +ENV WILDFLY_VERSION=33.0.2.Final +ENV WILDFLY_SHA1=a42e8cb6a83931a8f85c7064cb7220e16c6dc0c9 +ENV JBOSS_HOME=/opt/jboss/wildfly USER root @@ -35,7 +35,7 @@ RUN cd $HOME \ && chmod -R g+rw ${JBOSS_HOME} # Ensure signals are forwarded to the JVM process correctly for graceful shutdown -ENV LAUNCH_JBOSS_IN_BACKGROUND true +ENV LAUNCH_JBOSS_IN_BACKGROUND=true USER jboss diff --git a/scripts/smoke-test.sh b/scripts/smoke-test.sh index 52ff490..4b460fe 100755 --- a/scripts/smoke-test.sh +++ b/scripts/smoke-test.sh @@ -40,7 +40,8 @@ check_wildfly_version() { return 1 } -WILDFLY_VERSION=$(grep "ENV WILDFLY_VERSION" Dockerfile | rev | cut -d' ' -f1 | rev) +# Get the WildFly version by cutting "ENV WILDFLY_VERSION=" +WILDFLY_VERSION=$(grep "ENV WILDFLY_VERSION=" Dockerfile | cut -c21-) docker run --rm -p 8080:8080 ${WILDFLY_IMAGE} & sleep 2