diff --git a/bitnami/wordpress/6/debian-11/Dockerfile b/bitnami/wordpress/6/debian-11/Dockerfile index 9c8ddad21beb..5f0de4161889 100644 --- a/bitnami/wordpress/6/debian-11/Dockerfile +++ b/bitnami/wordpress/6/debian-11/Dockerfile @@ -5,7 +5,7 @@ ARG TARGETARCH LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="6.1.1-debian-11-r44" \ + org.opencontainers.image.ref.name="6.1.1-debian-11-r45" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/wordpress" \ org.opencontainers.image.title="wordpress" \ org.opencontainers.image.vendor="VMware, Inc." \ @@ -22,13 +22,12 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages acl ca-certificates curl less libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre2-8-0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "render-template-1.0.5-0-linux-${OS_ARCH}-debian-11" \ "php-8.1.15-2-linux-${OS_ARCH}-debian-11" \ "apache-2.4.55-4-linux-${OS_ARCH}-debian-11" \ - "wp-cli-2.7.1-2-linux-${OS_ARCH}-debian-11" \ "mysql-client-10.6.12-0-linux-${OS_ARCH}-debian-11" \ "libphp-8.1.15-0-linux-${OS_ARCH}-debian-11" \ - "wordpress-6.1.1-23-linux-${OS_ARCH}-debian-11" \ + "wordpress-6.1.1-25-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.5-0-linux-${OS_ARCH}-debian-11" \ "gosu-1.16.0-1-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ @@ -51,12 +50,11 @@ RUN /opt/bitnami/scripts/apache/postunpack.sh RUN /opt/bitnami/scripts/php/postunpack.sh RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh RUN /opt/bitnami/scripts/wordpress/postunpack.sh -RUN /opt/bitnami/scripts/wp-cli/postunpack.sh ENV APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ APP_VERSION="6.1.1" \ BITNAMI_APP_NAME="wordpress" \ - PATH="/opt/bitnami/common/bin:/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/wp-cli/bin:/opt/bitnami/mysql/bin:$PATH" + PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:/opt/bitnami/wp-cli/bin:$PATH" EXPOSE 8080 8443 diff --git a/bitnami/wordpress/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/wordpress/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 27f46081bd5e..4dff297e5d59 100644 --- a/bitnami/wordpress/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/wordpress/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -43,16 +43,9 @@ }, "wordpress": { "arch": "amd64", - "digest": "1b8a1163e9be0015e3002be9ce95e1a9f64bc73ef35eb5c8a836fc0e337b8ef1", + "digest": "5b25b07844355474a0535c8107ed2a14553f84d1eaef29bcd57311609336b80f", "distro": "debian-11", "type": "NAMI", - "version": "6.1.1-23" - }, - "wp-cli": { - "arch": "amd64", - "digest": "a331c32dd2dfd85d0209c83713da9998214a4b539ddadf42391dbad32a01293e", - "distro": "debian-11", - "type": "NAMI", - "version": "2.7.1-2" + "version": "6.1.1-25" } } \ No newline at end of file diff --git a/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wordpress-env.sh b/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wordpress-env.sh index f3d133d0ce1c..16d07b9d8198 100644 --- a/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wordpress-env.sh +++ b/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wordpress-env.sh @@ -107,6 +107,11 @@ unset wordpress_env_vars # Paths export WORDPRESS_BASE_DIR="${BITNAMI_ROOT_DIR}/wordpress" export WORDPRESS_CONF_FILE="${WORDPRESS_BASE_DIR}/wp-config.php" +export WP_CLI_BASE_DIR="${BITNAMI_ROOT_DIR}/wp-cli" +export WP_CLI_BIN_DIR="${WP_CLI_BASE_DIR}/bin" +export WP_CLI_CONF_DIR="${WP_CLI_BASE_DIR}/conf" +export WP_CLI_CONF_FILE="${WP_CLI_CONF_DIR}/wp-cli.yml" +export PATH="${BITNAMI_ROOT_DIR}/common/bin:${PATH}" # WordPress persistence configuration export WORDPRESS_VOLUME_DIR="${BITNAMI_VOLUME_DIR}/wordpress" @@ -195,4 +200,8 @@ export PHP_DEFAULT_MEMORY_LIMIT="512M" # only used at build time export PHP_DEFAULT_POST_MAX_SIZE="80M" # only used at build time export PHP_DEFAULT_UPLOAD_MAX_FILESIZE="80M" # only used at build time +# System users (when running with a privileged user) +export WP_CLI_DAEMON_USER="daemon" +export WP_CLI_DAEMON_GROUP="daemon" + # Custom environment variables may be defined below diff --git a/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wp-cli/bitnami-templates/wp.tpl b/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wordpress/bitnami-templates/wp.tpl similarity index 100% rename from bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wp-cli/bitnami-templates/wp.tpl rename to bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wordpress/bitnami-templates/wp.tpl diff --git a/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wordpress/postunpack.sh b/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wordpress/postunpack.sh index 07e8a382c1ca..cd06435396ad 100755 --- a/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wordpress/postunpack.sh +++ b/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wordpress/postunpack.sh @@ -58,3 +58,26 @@ web_server_validate # Do not move htaccess files via WORDPRESS_HTACCESS_OVERRIDE_NONE # so that users can choose whether to do it or not during initialization WORDPRESS_HTACCESS_OVERRIDE_NONE=no wordpress_generate_web_server_configuration + +# wp-cli +# Ensure the WordPress base directory exists and has proper permissions +info "Configuring file permissions for WP-CLI" +ensure_user_exists "$WP_CLI_DAEMON_USER" --group "$WP_CLI_DAEMON_GROUP" +declare -a writable_dirs=( + "${WP_CLI_BASE_DIR}/.cache" + "${WP_CLI_BASE_DIR}/.packages" +) +for dir in "${writable_dirs[@]}"; do + ensure_dir_exists "$dir" + # Use daemon:root ownership for compatibility when running as a non-root user + configure_permissions_ownership "$dir" -d "g+rwx" -f "g+rw" -u "$WP_CLI_DAEMON_USER" -g "root" +done + +# Configure wp-cli +ensure_dir_exists "$WP_CLI_CONF_DIR" +cat >"$WP_CLI_CONF_FILE" <"${WP_CLI_BIN_DIR}/wp" +configure_permissions_ownership "${WP_CLI_BIN_DIR}/wp" -f "755" diff --git a/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wordpress/setup.sh b/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wordpress/setup.sh index 3cd3af3d0b91..970e34fd95b0 100755 --- a/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wordpress/setup.sh +++ b/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wordpress/setup.sh @@ -10,9 +10,6 @@ set -o pipefail # Load WordPress environment . /opt/bitnami/scripts/wordpress-env.sh -# Load WP-CLI environment for 'wp_execute' (after 'wordpress-env.sh' so that MODULE is not set to a wrong value) -. /opt/bitnami/scripts/wp-cli-env.sh - # Load PHP environment for 'wp_execute' (after 'wordpress-env.sh' so that MODULE is not set to a wrong value) . /opt/bitnami/scripts/php-env.sh diff --git a/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wp-cli-env.sh b/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wp-cli-env.sh deleted file mode 100644 index d34767cf7dcd..000000000000 --- a/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wp-cli-env.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -# -# Environment configuration for wp-cli - -# The values for all environment variables will be set in the below order of precedence -# 1. Custom environment variables defined below after Bitnami defaults -# 2. Constants defined in this file (environment variables with no default), i.e. BITNAMI_ROOT_DIR -# 3. Environment variables overridden via external files using *_FILE variables (see below) -# 4. Environment variables set externally (i.e. current Bash context/Dockerfile/userdata) - -# Load logging library -# shellcheck disable=SC1090,SC1091 -. /opt/bitnami/scripts/liblog.sh - -export BITNAMI_ROOT_DIR="/opt/bitnami" -export BITNAMI_VOLUME_DIR="/bitnami" - -# Logging configuration -export MODULE="${MODULE:-wp-cli}" -export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}" - -# Paths -export WP_CLI_BASE_DIR="${BITNAMI_ROOT_DIR}/wp-cli" -export WP_CLI_BIN_DIR="${WP_CLI_BASE_DIR}/bin" -export WP_CLI_CONF_DIR="${WP_CLI_BASE_DIR}/conf" -export WP_CLI_CONF_FILE="${WP_CLI_CONF_DIR}/wp-cli.yml" -export PATH="${BITNAMI_ROOT_DIR}/common/bin:${PATH}" - -# System users (when running with a privileged user) -export WP_CLI_DAEMON_USER="daemon" -export WP_CLI_DAEMON_GROUP="daemon" - -# Custom environment variables may be defined below diff --git a/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wp-cli/postunpack.sh b/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wp-cli/postunpack.sh deleted file mode 100755 index d69dbc9e6f41..000000000000 --- a/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wp-cli/postunpack.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# shellcheck disable=SC1090,SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# Load WP-CLI environment -. /opt/bitnami/scripts/wp-cli-env.sh - -# Load PHP environment for WP-CLI templates (after 'wp-cli-env.sh' so that MODULE is not set to a wrong value) -. /opt/bitnami/scripts/php-env.sh - -# Load libraries -. /opt/bitnami/scripts/libfile.sh -. /opt/bitnami/scripts/libfs.sh -. /opt/bitnami/scripts/liblog.sh - -# Ensure the WordPress base directory exists and has proper permissions -info "Configuring file permissions for WP-CLI" -ensure_user_exists "$WP_CLI_DAEMON_USER" --group "$WP_CLI_DAEMON_GROUP" -declare -a writable_dirs=( - "${WP_CLI_BASE_DIR}/.cache" "${WP_CLI_BASE_DIR}/.packages" -) -for dir in "${writable_dirs[@]}"; do - ensure_dir_exists "$dir" - # Use daemon:root ownership for compatibility when running as a non-root user - configure_permissions_ownership "$dir" -d "g+rwx" -f "g+rw" -u "$WP_CLI_DAEMON_USER" -g "root" -done - -# Configure wp-cli -ensure_dir_exists "$WP_CLI_CONF_DIR" -cat >"$WP_CLI_CONF_FILE" <"${WP_CLI_BIN_DIR}/wp" -configure_permissions_ownership "${WP_CLI_BIN_DIR}/wp" -f "755"