From 6f43557c28d13dff37eb24bd2824825fd663b795 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 27 Mar 2024 16:55:39 +0100 Subject: [PATCH] [bitnami/wildfly] Release 31.0.1-debian-12-r3 (#64185) Signed-off-by: Bitnami Containers --- bitnami/wildfly/31/debian-12/Dockerfile | 4 +-- .../rootfs/opt/bitnami/scripts/wildfly-env.sh | 4 +++ .../opt/bitnami/scripts/wildfly/entrypoint.sh | 8 ++++++ .../opt/bitnami/scripts/wildfly/postunpack.sh | 12 ++++++++- bitnami/wildfly/README.md | 25 +++++++++++++------ 5 files changed, 43 insertions(+), 10 deletions(-) diff --git a/bitnami/wildfly/31/debian-12/Dockerfile b/bitnami/wildfly/31/debian-12/Dockerfile index 378511c52ef3..1cff1c92f8a8 100644 --- a/bitnami/wildfly/31/debian-12/Dockerfile +++ b/bitnami/wildfly/31/debian-12/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2024-03-15T01:11:25Z" \ + org.opencontainers.image.created="2024-03-27T15:13:13Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="31.0.1-debian-12-r2" \ + org.opencontainers.image.ref.name="31.0.1-debian-12-r3" \ org.opencontainers.image.title="wildfly" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="31.0.1" diff --git a/bitnami/wildfly/31/debian-12/rootfs/opt/bitnami/scripts/wildfly-env.sh b/bitnami/wildfly/31/debian-12/rootfs/opt/bitnami/scripts/wildfly-env.sh index 8fd3a18d316b..a0452274d733 100644 --- a/bitnami/wildfly/31/debian-12/rootfs/opt/bitnami/scripts/wildfly-env.sh +++ b/bitnami/wildfly/31/debian-12/rootfs/opt/bitnami/scripts/wildfly-env.sh @@ -57,6 +57,10 @@ export WILDFLY_BIN_DIR="${WILDFLY_BASE_DIR}/bin" export WILDFLY_CONF_DIR="${WILDFLY_BASE_DIR}/standalone/configuration" export WILDFLY_LOGS_DIR="${WILDFLY_BASE_DIR}/standalone/log" export WILDFLY_TMP_DIR="${WILDFLY_BASE_DIR}/standalone/tmp" +export WILDFLY_DOMAIN_DIR="${WILDFLY_BASE_DIR}/domain" +export WILDFLY_STANDALONE_DIR="${WILDFLY_BASE_DIR}/standalone" +export WILDFLY_DEFAULT_DOMAIN_DIR="${WILDFLY_BASE_DIR}/domain.default" +export WILDFLY_DEFAULT_STANDALONE_DIR="${WILDFLY_BASE_DIR}/standalone.default" export WILDFLY_CONF_FILE="${WILDFLY_CONF_FILE:-${WILDFLY_CONF_DIR}/standalone.xml}" export WILDFLY_PID_FILE="${WILDFLY_TMP_DIR}/wildfly.pid" diff --git a/bitnami/wildfly/31/debian-12/rootfs/opt/bitnami/scripts/wildfly/entrypoint.sh b/bitnami/wildfly/31/debian-12/rootfs/opt/bitnami/scripts/wildfly/entrypoint.sh index 9d354e825ec9..872b95fbab36 100755 --- a/bitnami/wildfly/31/debian-12/rootfs/opt/bitnami/scripts/wildfly/entrypoint.sh +++ b/bitnami/wildfly/31/debian-12/rootfs/opt/bitnami/scripts/wildfly/entrypoint.sh @@ -18,6 +18,14 @@ set -o pipefail print_welcome_page +# We add the copy from default config in the entrypoint to not break users +# bypassing the setup.sh logic. If the file already exists do not overwrite (in +# case someone mounts a configuration file in opt/bitnami/wildfly/standalone) +debug "Copying files from $WILDFLY_DEFAULT_STANDALONE_DIR to $WILDFLY_STANDALONE_DIR" +cp -nr "$WILDFLY_DEFAULT_STANDALONE_DIR"/. "$WILDFLY_STANDALONE_DIR" || true +debug "Copying files from $WILDFLY_DEFAULT_DOMAIN_DIR to $WILDFLY_DOMAIN_DIR" +cp -nr "$WILDFLY_DEFAULT_DOMAIN_DIR"/. "$WILDFLY_DOMAIN_DIR" || true + if [[ "$1" = "/opt/bitnami/scripts/wildfly/run.sh" ]]; then info "** Starting WildFly setup **" /opt/bitnami/scripts/wildfly/setup.sh diff --git a/bitnami/wildfly/31/debian-12/rootfs/opt/bitnami/scripts/wildfly/postunpack.sh b/bitnami/wildfly/31/debian-12/rootfs/opt/bitnami/scripts/wildfly/postunpack.sh index dc7dee669a5f..9e6ea7ef9aae 100755 --- a/bitnami/wildfly/31/debian-12/rootfs/opt/bitnami/scripts/wildfly/postunpack.sh +++ b/bitnami/wildfly/31/debian-12/rootfs/opt/bitnami/scripts/wildfly/postunpack.sh @@ -21,10 +21,20 @@ set -o pipefail # Ensure required directories exist chmod g+rwX "$WILDFLY_BASE_DIR" chmod g+rw "${WILDFLY_BIN_DIR}/standalone.conf" -for dir in "$WILDFLY_HOME_DIR" "${WILDFLY_BASE_DIR}/domain" "${WILDFLY_BASE_DIR}/standalone" "$WILDFLY_DATA_DIR"; do +for dir in "$WILDFLY_HOME_DIR" "${WILDFLY_BASE_DIR}/domain" "${WILDFLY_BASE_DIR}/standalone" "$WILDFLY_DEFAULT_STANDALONE_DIR" "$WILDFLY_DEFAULT_DOMAIN_DIR" "$WILDFLY_DATA_DIR"; do ensure_dir_exists "$dir" configure_permissions_ownership "$dir" -d "775" -f "664" done # Create a symlink to standalone deployments directory so users can mount their custom webapps at /app ln -sf "${WILDFLY_BASE_DIR}/standalone/deployments" /app + +# Copy all initially generated configuration files and standalone to the default directory +# (this is to avoid breaking when entrypoint is being overridden) +cp -r "$WILDFLY_STANDALONE_DIR"/* "$WILDFLY_DEFAULT_STANDALONE_DIR" +cp -r "$WILDFLY_DOMAIN_DIR"/* "$WILDFLY_DEFAULT_DOMAIN_DIR" + +# In order to make the container work with non-root group we need to make +# a set of files writable by "other", as by default are owned by wildfly:root +chmod o+rX -R "${WILDFLY_DEFAULT_STANDALONE_DIR}"/* +chmod o+rX -R "${WILDFLY_DEFAULT_DOMAIN_DIR}"/* diff --git a/bitnami/wildfly/README.md b/bitnami/wildfly/README.md index 2272c5d8c9ac..34eadfe9e3bd 100644 --- a/bitnami/wildfly/README.md +++ b/bitnami/wildfly/README.md @@ -175,13 +175,20 @@ $ docker exec -it wildfly-server \ #### Customizable environment variables -| Name | Description | Default Value | -|----------------------------|-----------------------------------------------------------------------------------------------|-----------------------------------------| -| `WILDFLY_CONF_FILE` | Path to the WildFly configuration file. | `${WILDFLY_CONF_DIR}/standalone.xml` | -| `WILDFLY_MOUNTED_CONF_DIR` | Directory for including custom configuration files (that override the default generated ones) | `${WILDFLY_VOLUME_DIR}/configuration` | -| `WILDFLY_DATA_DIR` | WildFly data directory. | `${WILDFLY_VOLUME_DIR}/standalone/data` | -| `WILDFLY_USERNAME` | WildFly admin username. | `user` | -| `JAVA_HOME` | Java Home directory. | `${BITNAMI_ROOT_DIR}/java` | +| Name | Description | Default Value | +|-------------------------------------|-----------------------------------------------------------------------------------------------|-----------------------------------------| +| `WILDFLY_CONF_FILE` | Path to the WildFly configuration file. | `${WILDFLY_CONF_DIR}/standalone.xml` | +| `WILDFLY_MOUNTED_CONF_DIR` | Directory for including custom configuration files (that override the default generated ones) | `${WILDFLY_VOLUME_DIR}/configuration` | +| `WILDFLY_DATA_DIR` | WildFly data directory. | `${WILDFLY_VOLUME_DIR}/standalone/data` | +| `WILDFLY_SERVER_LISTEN_ADDRESS` | WildFly server listen address. | `nil` | +| `WILDFLY_MANAGEMENT_LISTEN_ADDRESS` | WildFly management listen address. | `nil` | +| `WILDFLY_HTTP_PORT_NUMBER` | Port number used by the WildFly for HTTP connections. | `nil` | +| `WILDFLY_AJP_PORT_NUMBER` | Port number used by the WildFly for AJP connections. | `nil` | +| `WILDFLY_MANAGEMENT_PORT_NUMBER` | Port number used by the WildFly management interface. | `nil` | +| `WILDFLY_USERNAME` | WildFly admin username. | `user` | +| `WILDFLY_PASSWORD` | WildFly admin user password. | `nil` | +| `JAVA_HOME` | Java Home directory. | `${BITNAMI_ROOT_DIR}/java` | +| `JAVA_OPTS` | Java options. | `nil` | #### Read-only environment variables @@ -193,6 +200,10 @@ $ docker exec -it wildfly-server \ | `WILDFLY_CONF_DIR` | WildFly server configuration directory. | `${WILDFLY_BASE_DIR}/standalone/configuration` | | `WILDFLY_LOGS_DIR` | WildFly directory for log files. | `${WILDFLY_BASE_DIR}/standalone/log` | | `WILDFLY_TMP_DIR` | WildFly directory for runtime temporary files. | `${WILDFLY_BASE_DIR}/standalone/tmp` | +| `WILDFLY_DOMAIN_DIR` | Wildfly domain directory. | `${WILDFLY_BASE_DIR}/domain` | +| `WILDFLY_STANDALONE_DIR` | Wildfly standalone directory. | `${WILDFLY_BASE_DIR}/standalone` | +| `WILDFLY_DEFAULT_DOMAIN_DIR` | Wildfly default domain directory. | `${WILDFLY_BASE_DIR}/domain.default` | +| `WILDFLY_DEFAULT_STANDALONE_DIR` | Wildfly default standalone directory. | `${WILDFLY_BASE_DIR}/standalone.default` | | `WILDFLY_PID_FILE` | Path to the WildFly PID file. | `${WILDFLY_TMP_DIR}/wildfly.pid` | | `WILDFLY_VOLUME_DIR` | WildFly directory for mounted configuration files. | `${BITNAMI_VOLUME_DIR}/wildfly` | | `WILDFLY_DAEMON_USER` | WildFly system user. | `wildfly` |