[bitnami/drupal] Release 10.3.1-debian-12-r0 (#68806)
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Bitnami Bot
GitHub
parent
b3815d1e4e
commit
bcc6336372
|
|
@ -7,15 +7,15 @@ 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-06-29T15:50:47Z" \
|
||||
org.opencontainers.image.created="2024-07-04T16:03:44Z" \
|
||||
org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
|
||||
org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/drupal/README.md" \
|
||||
org.opencontainers.image.licenses="Apache-2.0" \
|
||||
org.opencontainers.image.ref.name="10.3.0-debian-12-r2" \
|
||||
org.opencontainers.image.ref.name="10.3.1-debian-12-r0" \
|
||||
org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/drupal" \
|
||||
org.opencontainers.image.title="drupal" \
|
||||
org.opencontainers.image.vendor="Broadcom, Inc." \
|
||||
org.opencontainers.image.version="10.3.0"
|
||||
org.opencontainers.image.version="10.3.1"
|
||||
|
||||
ENV HOME="/" \
|
||||
OS_ARCH="${TARGETARCH:-amd64}" \
|
||||
|
|
@ -28,12 +28,12 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
|
|||
RUN install_packages acl ca-certificates curl gnupg libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi8 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhashkit2 libhogweed6 libicu72 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.5-0 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 libssl3 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp7 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 libzstd1 openssl procps unzip zlib1g
|
||||
RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
|
||||
COMPONENTS=( \
|
||||
"render-template-1.0.6-14-linux-${OS_ARCH}-debian-12" \
|
||||
"php-8.2.20-5-linux-${OS_ARCH}-debian-12" \
|
||||
"apache-2.4.59-2-linux-${OS_ARCH}-debian-12" \
|
||||
"render-template-1.0.7-2-linux-${OS_ARCH}-debian-12" \
|
||||
"php-8.2.21-0-linux-${OS_ARCH}-debian-12" \
|
||||
"apache-2.4.61-0-linux-${OS_ARCH}-debian-12" \
|
||||
"mysql-client-11.3.2-4-linux-${OS_ARCH}-debian-12" \
|
||||
"libphp-8.2.20-0-linux-${OS_ARCH}-debian-12" \
|
||||
"drupal-10.3.0-2-linux-${OS_ARCH}-debian-12" \
|
||||
"libphp-8.2.21-1-linux-${OS_ARCH}-debian-12" \
|
||||
"drupal-10.3.1-0-linux-${OS_ARCH}-debian-12" \
|
||||
) ; \
|
||||
for COMPONENT in "${COMPONENTS[@]}"; do \
|
||||
if [ ! -f "${COMPONENT}.tar.gz" ]; then \
|
||||
|
|
@ -58,7 +58,7 @@ RUN /opt/bitnami/scripts/drupal/postunpack.sh
|
|||
RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
|
||||
ENV APACHE_HTTPS_PORT_NUMBER="" \
|
||||
APACHE_HTTP_PORT_NUMBER="" \
|
||||
APP_VERSION="10.3.0" \
|
||||
APP_VERSION="10.3.1" \
|
||||
BITNAMI_APP_NAME="drupal" \
|
||||
PATH="/opt/bitnami/common/bin:/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/drupal/vendor/bin:$PATH"
|
||||
|
||||
|
|
|
|||
|
|
@ -3,19 +3,19 @@
|
|||
"arch": "amd64",
|
||||
"distro": "debian-12",
|
||||
"type": "NAMI",
|
||||
"version": "2.4.59-2"
|
||||
"version": "2.4.61-0"
|
||||
},
|
||||
"drupal": {
|
||||
"arch": "amd64",
|
||||
"distro": "debian-12",
|
||||
"type": "NAMI",
|
||||
"version": "10.3.0-2"
|
||||
"version": "10.3.1-0"
|
||||
},
|
||||
"libphp": {
|
||||
"arch": "amd64",
|
||||
"distro": "debian-12",
|
||||
"type": "NAMI",
|
||||
"version": "8.2.20-0"
|
||||
"version": "8.2.21-1"
|
||||
},
|
||||
"mysql-client": {
|
||||
"arch": "amd64",
|
||||
|
|
@ -27,12 +27,12 @@
|
|||
"arch": "amd64",
|
||||
"distro": "debian-12",
|
||||
"type": "NAMI",
|
||||
"version": "8.2.20-5"
|
||||
"version": "8.2.21-0"
|
||||
},
|
||||
"render-template": {
|
||||
"arch": "amd64",
|
||||
"distro": "debian-12",
|
||||
"type": "NAMI",
|
||||
"version": "1.0.6-14"
|
||||
"version": "1.0.7-2"
|
||||
}
|
||||
}
|
||||
|
|
@ -438,69 +438,6 @@ mysql_stop() {
|
|||
fi
|
||||
}
|
||||
|
||||
########################
|
||||
# Initialize database data
|
||||
# Globals:
|
||||
# BITNAMI_DEBUG
|
||||
# DB_*
|
||||
# Arguments:
|
||||
# None
|
||||
# Returns:
|
||||
# None
|
||||
#########################
|
||||
mysql_install_db() {
|
||||
local command="${DB_BIN_DIR}/mysql_install_db"
|
||||
local -a args=("--defaults-file=${DB_CONF_FILE}" "--basedir=${DB_BASE_DIR}" "--datadir=${DB_DATA_DIR}")
|
||||
|
||||
# Add flags specified via the 'DB_EXTRA_FLAGS' environment variable
|
||||
read -r -a db_extra_flags <<< "$(mysql_extra_flags)"
|
||||
[[ "${#db_extra_flags[@]}" -gt 0 ]] && args+=("${db_extra_flags[@]}")
|
||||
|
||||
am_i_root && args=("${args[@]}" "--user=$DB_DAEMON_USER")
|
||||
if [[ "$DB_FLAVOR" = "mariadb" ]]; then
|
||||
args+=("--auth-root-authentication-method=normal")
|
||||
# Feature available only in MariaDB 10.5+
|
||||
# ref: https://mariadb.com/kb/en/mysql_install_db/#not-creating-the-test-database-and-anonymous-user
|
||||
if [[ ! "$(mysql_get_version)" =~ ^10\.[01234]\. ]]; then
|
||||
is_boolean_yes "$DB_SKIP_TEST_DB" && args+=("--skip-test-db")
|
||||
fi
|
||||
else
|
||||
command="${DB_BIN_DIR}/mysqld"
|
||||
args+=("--initialize-insecure")
|
||||
fi
|
||||
debug_execute "$command" "${args[@]}"
|
||||
}
|
||||
|
||||
########################
|
||||
# Upgrade Database Schema
|
||||
# Globals:
|
||||
# BITNAMI_DEBUG
|
||||
# DB_*
|
||||
# Arguments:
|
||||
# None
|
||||
# Returns:
|
||||
# None
|
||||
#########################
|
||||
mysql_upgrade() {
|
||||
local -a args=("--defaults-file=${DB_CONF_FILE}" "-u" "$DB_ROOT_USER")
|
||||
local major_version minor_version patch_version
|
||||
major_version="$(get_sematic_version "$(mysql_get_version)" 1)"
|
||||
minor_version="$(get_sematic_version "$(mysql_get_version)" 2)"
|
||||
patch_version="$(get_sematic_version "$(mysql_get_version)" 3)"
|
||||
info "Running mysql_upgrade"
|
||||
if [[ "$DB_FLAVOR" = *"mysql"* ]] && [[
|
||||
"$major_version" -gt "8"
|
||||
|| ( "$major_version" -eq "8" && "$minor_version" -gt "0" )
|
||||
|| ( "$major_version" -eq "8" && "$minor_version" -eq "0" && "$patch_version" -ge "16" )
|
||||
]]; then
|
||||
mysql_stop
|
||||
mysql_start_bg "--upgrade=FORCE"
|
||||
else
|
||||
mysql_start_bg
|
||||
is_boolean_yes "${ROOT_AUTH_ENABLED:-false}" && args+=("-p$(get_master_env_var_value ROOT_PASSWORD)")
|
||||
debug_execute "${DB_BIN_DIR}/mysql_upgrade" "${args[@]}" || echo "This installation is already upgraded"
|
||||
fi
|
||||
}
|
||||
|
||||
########################
|
||||
# Migrate old custom configuration files
|
||||
|
|
@ -529,98 +466,6 @@ mysql_migrate_old_configuration() {
|
|||
fi
|
||||
}
|
||||
|
||||
########################
|
||||
# Ensure a db user exists with the given password for the '%' host
|
||||
# Globals:
|
||||
# DB_*
|
||||
# Flags:
|
||||
# -p|--password - database password
|
||||
# -u|--user - database user
|
||||
# --auth-plugin - authentication plugin
|
||||
# --use-ldap - authenticate user via LDAP
|
||||
# --host - database host
|
||||
# --port - database host
|
||||
# Arguments:
|
||||
# $1 - database user
|
||||
# Returns:
|
||||
# None
|
||||
#########################
|
||||
mysql_ensure_user_exists() {
|
||||
local -r user="${1:?user is required}"
|
||||
local password=""
|
||||
local auth_plugin=""
|
||||
local use_ldap="no"
|
||||
local hosts
|
||||
local auth_string=""
|
||||
# For accessing an external database
|
||||
local db_host=""
|
||||
local db_port=""
|
||||
|
||||
# Validate arguments
|
||||
shift 1
|
||||
while [ "$#" -gt 0 ]; do
|
||||
case "$1" in
|
||||
-p|--password)
|
||||
shift
|
||||
password="${1:?missing database password}"
|
||||
;;
|
||||
--auth-plugin)
|
||||
shift
|
||||
auth_plugin="${1:?missing authentication plugin}"
|
||||
;;
|
||||
--use-ldap)
|
||||
use_ldap="yes"
|
||||
;;
|
||||
--host)
|
||||
shift
|
||||
db_host="${1:?missing database host}"
|
||||
;;
|
||||
--port)
|
||||
shift
|
||||
db_port="${1:?missing database port}"
|
||||
;;
|
||||
*)
|
||||
echo "Invalid command line flag $1" >&2
|
||||
return 1
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
if is_boolean_yes "$use_ldap"; then
|
||||
auth_string="identified via pam using '$DB_FLAVOR'"
|
||||
elif [[ -n "$password" ]]; then
|
||||
if [[ -n "$auth_plugin" ]]; then
|
||||
auth_string="identified with $auth_plugin by '$password'"
|
||||
else
|
||||
auth_string="identified by '$password'"
|
||||
fi
|
||||
fi
|
||||
debug "creating database user \'$user\'"
|
||||
|
||||
local -a mysql_execute_cmd=("mysql_execute")
|
||||
local -a mysql_execute_print_output_cmd=("mysql_execute_print_output")
|
||||
if [[ -n "$db_host" && -n "$db_port" ]]; then
|
||||
mysql_execute_cmd=("mysql_remote_execute" "$db_host" "$db_port")
|
||||
mysql_execute_print_output_cmd=("mysql_remote_execute_print_output" "$db_host" "$db_port")
|
||||
fi
|
||||
|
||||
local mysql_create_user_cmd
|
||||
[[ "$DB_FLAVOR" = "mariadb" ]] && mysql_create_user_cmd="create or replace user" || mysql_create_user_cmd="create user if not exists"
|
||||
"${mysql_execute_cmd[@]}" "mysql" "$DB_ROOT_USER" "$DB_ROOT_PASSWORD" <<EOF
|
||||
${mysql_create_user_cmd} '${user}'@'%' ${auth_string};
|
||||
EOF
|
||||
debug "Removing all other hosts for the user"
|
||||
hosts=$("${mysql_execute_print_output_cmd[@]}" "mysql" "$DB_ROOT_USER" "$DB_ROOT_PASSWORD" <<EOF
|
||||
select Host from user where User='${user}' and Host!='%';
|
||||
EOF
|
||||
)
|
||||
for host in $hosts; do
|
||||
"${mysql_execute_cmd[@]}" "mysql" "$DB_ROOT_USER" "$DB_ROOT_PASSWORD" <<EOF
|
||||
drop user '$user'@'$host';
|
||||
EOF
|
||||
done
|
||||
}
|
||||
|
||||
########################
|
||||
# Ensure a db user does not exist
|
||||
# Globals:
|
||||
|
|
@ -858,7 +703,7 @@ mysql_ensure_optional_user_exists() {
|
|||
flags+=("-p" "$password")
|
||||
[[ -n "$auth_plugin" ]] && flags=("${flags[@]}" "--auth-plugin" "$auth_plugin")
|
||||
fi
|
||||
mysql_ensure_user_exists "${flags[@]}"
|
||||
"${DB_FLAVOR}"_ensure_user_exists "${flags[@]}"
|
||||
}
|
||||
|
||||
########################
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
rolling-tags:
|
||||
- "10"
|
||||
- 10-debian-12
|
||||
- 10.3.0
|
||||
- 10.3.1
|
||||
- latest
|
||||
|
|
|
|||
Loading…
Reference in New Issue