From 21cf9949a36bb79d6e034335156fb58ed0e677a8 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 8 Apr 2021 09:18:42 +0000 Subject: [PATCH] 3.9.25-debian-10-r34 release --- bitnami/joomla/3/debian-10/Dockerfile | 6 +- bitnami/joomla/3/debian-10/docker-compose.yml | 4 +- .../opt/bitnami/.bitnami_components.json | 4 +- .../prebuildfs/opt/bitnami/scripts/liblog.sh | 2 + .../opt/bitnami/scripts/libversion.sh | 4 +- .../opt/bitnami/scripts/libmysqlclient.sh | 64 ++++++++++--------- .../opt/bitnami/scripts/mysql-client-env.sh | 16 ++++- .../3/debian-10/rootfs/post-init.d/shell.sh | 3 +- bitnami/joomla/README.md | 2 +- bitnami/joomla/docker-compose.yml | 4 +- 10 files changed, 62 insertions(+), 47 deletions(-) diff --git a/bitnami/joomla/3/debian-10/Dockerfile b/bitnami/joomla/3/debian-10/Dockerfile index 0c42713480b8..42634190b8b0 100644 --- a/bitnami/joomla/3/debian-10/Dockerfile +++ b/bitnami/joomla/3/debian-10/Dockerfile @@ -9,7 +9,7 @@ ENV HOME="/" \ COPY prebuildfs / # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip libaudit1 libbsd0 libbz2-1.0 libc6 libcap-ng0 libcom-err2 libcurl4 libexpat1 libffi6 libfftw3-double3 libfontconfig1 libfreetype6 libgcc1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu63 libidn2-0 libjemalloc2 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 libmcrypt4 libmemcached11 libmemcachedutil2 libncurses6 libnettle6 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre3 libpng16-16 libpq5 libpsl5 libreadline7 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 tar zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.4.16-3" --checksum 0b18468b85271073f82fe1073474de459222e6b490f4952394f031ce79feff4b +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.4.16-4" --checksum 23024309516cba8bb7d9faab1e19ae5f0bf94a68c41409bedb828b335bd1f195 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.46-6" --checksum fb5216cb32c47100d039af1b738b2e9d48f48aac194ca9b47ffb9ea42517a9ea RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.28-0" --checksum 9398376ca9e2033d5bc193232e8aa9b57d91d4ccf06fa67bfa0d30ef36e44c25 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.4.16-0" --checksum c421ba5d9e4ad24e94662a3fa4fa73b172e5245a7a5bc866ce20d705d68d0882 @@ -19,8 +19,8 @@ RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-2" RUN chmod g+rwX /opt/bitnami COPY rootfs / -RUN /opt/bitnami/scripts/php/postunpack.sh 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/joomla/postunpack.sh RUN /opt/bitnami/scripts/mysql-client/postunpack.sh @@ -29,7 +29,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \ APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ BITNAMI_APP_NAME="joomla" \ - BITNAMI_IMAGE_VERSION="3.9.25-debian-10-r33" \ + BITNAMI_IMAGE_VERSION="3.9.25-debian-10-r34" \ MARIADB_HOST="mariadb" \ MARIADB_PORT_NUMBER="3306" \ MARIADB_ROOT_PASSWORD="" \ diff --git a/bitnami/joomla/3/debian-10/docker-compose.yml b/bitnami/joomla/3/debian-10/docker-compose.yml index 220b25125157..f344e2554fc2 100644 --- a/bitnami/joomla/3/debian-10/docker-compose.yml +++ b/bitnami/joomla/3/debian-10/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: mariadb: - image: 'docker.io/bitnami/mariadb:10.3-debian-10' + image: docker.io/bitnami/mariadb:10.3 environment: - ALLOW_EMPTY_PASSWORD=yes - MARIADB_USER=bn_joomla @@ -9,7 +9,7 @@ services: volumes: - 'mariadb_data:/bitnami/mariadb' joomla: - image: 'docker.io/bitnami/joomla:3-debian-10' + image: docker.io/bitnami/joomla:3 ports: - '80:8080' - '443:8443' diff --git a/bitnami/joomla/3/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/joomla/3/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 64fb15600359..7badc341b2df 100644 --- a/bitnami/joomla/3/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/joomla/3/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -36,10 +36,10 @@ }, "php": { "arch": "amd64", - "digest": "0b18468b85271073f82fe1073474de459222e6b490f4952394f031ce79feff4b", + "digest": "23024309516cba8bb7d9faab1e19ae5f0bf94a68c41409bedb828b335bd1f195", "distro": "debian-10", "type": "NAMI", - "version": "7.4.16-3" + "version": "7.4.16-4" }, "render-template": { "arch": "amd64", diff --git a/bitnami/joomla/3/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/joomla/3/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh index 60ec4cbfc32a..c7c0f6d4422a 100644 --- a/bitnami/joomla/3/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh +++ b/bitnami/joomla/3/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh @@ -106,5 +106,7 @@ indent() { for ((i = 0; i < num; i++)); do indent_unit="${indent_unit}${char}" done + # shellcheck disable=SC2001 + # Complex regex, see https://github.com/koalaman/shellcheck/wiki/SC2001#exceptions echo "$string" | sed "s/^/${indent_unit}/" } diff --git a/bitnami/joomla/3/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/joomla/3/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh index 66d4f457bdd2..f3bc7568bfa5 100644 --- a/bitnami/joomla/3/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/joomla/3/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh @@ -9,7 +9,7 @@ # Functions ######################## -# Gets semantic version +# Gets semantic version # Arguments: # $1 - version: string to extract major.minor.patch # $2 - section: 1 to extract major, 2 to extract minor, 3 to extract patch @@ -38,7 +38,7 @@ get_sematic_version () { done local number_regex='^[0-9]+$' - if [[ "$section" =~ $number_regex ]] && (( $section > 0 )) && (( $section <= 3 )); then + if [[ "$section" =~ $number_regex ]] && (( section > 0 )) && (( section <= 3 )); then echo "${version_sections[$section]}" return else diff --git a/bitnami/joomla/3/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/joomla/3/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh index 2afb2e9689c7..18898fc24967 100644 --- a/bitnami/joomla/3/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh +++ b/bitnami/joomla/3/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh @@ -12,7 +12,7 @@ ######################## # Validate settings in MYSQL_CLIENT_* environment variables # Globals: -# DB_* +# MYSQL_CLIENT_* # Arguments: # None # Returns: @@ -45,24 +45,24 @@ mysql_client_validate() { } # Only validate environment variables if any action needs to be performed - check_yes_no_value "DB_ENABLE_SSL_WRAPPER" + check_yes_no_value "MYSQL_CLIENT_ENABLE_SSL_WRAPPER" - if [[ -n "$DB_CREATE_DATABASE_USER" || -n "$DB_CREATE_DATABASE_NAME" ]]; then + if [[ -n "$MYSQL_CLIENT_CREATE_DATABASE_USER" || -n "$MYSQL_CLIENT_CREATE_DATABASE_NAME" ]]; then if is_boolean_yes "$ALLOW_EMPTY_PASSWORD"; then empty_password_enabled_warn else - if [[ -z "$DB_ROOT_PASSWORD" ]]; then - empty_password_error "$(get_env_var ROOT_PASSWORD)" + if [[ -z "$MYSQL_CLIENT_DATABASE_ROOT_PASSWORD" ]]; then + empty_password_error "MYSQL_CLIENT_DATABASE_ROOT_PASSWORD" fi - if [[ -n "$DB_CREATE_DATABASE_USER" ]] && [[ -z "$DB_CREATE_DATABASE_PASSWORD" ]]; then - empty_password_error "$(get_env_var CREATE_DATABASE_PASSWORD)" + if [[ -n "$MYSQL_CLIENT_CREATE_DATABASE_USER" ]] && [[ -z "$MYSQL_CLIENT_CREATE_DATABASE_PASSWORD" ]]; then + empty_password_error "MYSQL_CLIENT_CREATE_DATABASE_PASSWORD" fi fi - if [[ "${DB_ROOT_PASSWORD:-}" = *\\* ]]; then - backslash_password_error "$(get_env_var ROOT_PASSWORD)" + if [[ "${MYSQL_CLIENT_DATABASE_ROOT_PASSWORD:-}" = *\\* ]]; then + backslash_password_error "MYSQL_CLIENT_DATABASE_ROOT_PASSWORD" fi - if [[ "${DB_CREATE_DATABASE_PASSWORD:-}" = *\\* ]]; then - backslash_password_error "$(get_env_var CREATE_DATABASE_PASSWORD)" + if [[ "${MYSQL_CLIENT_CREATE_DATABASE_PASSWORD:-}" = *\\* ]]; then + backslash_password_error "MYSQL_CLIENT_CREATE_DATABASE_PASSWORD" fi fi return "$error_code" @@ -71,7 +71,7 @@ mysql_client_validate() { ######################## # Perform actions to a database # Globals: -# DB_* +# MYSQL_CLIENT_* # Arguments: # None # Returns: @@ -79,14 +79,14 @@ mysql_client_validate() { ######################### mysql_client_initialize() { # Wrap binary to force the usage of SSL - if is_boolean_yes "$DB_ENABLE_SSL_WRAPPER"; then + if is_boolean_yes "$MYSQL_CLIENT_ENABLE_SSL_WRAPPER"; then mysql_client_wrap_binary_for_ssl fi # Wait for the database to be accessible if any action needs to be performed - if [[ -n "$DB_CREATE_DATABASE_USER" || -n "$DB_CREATE_DATABASE_NAME" ]]; then + if [[ -n "$MYSQL_CLIENT_CREATE_DATABASE_USER" || -n "$MYSQL_CLIENT_CREATE_DATABASE_NAME" ]]; then info "Trying to connect to the database server" check_mysql_connection() { - echo "SELECT 1" | mysql_execute "mysql" "$DB_ROOT_USER" "$DB_ROOT_PASSWORD" "-h" "$DB_DATABASE_HOST" "-P" "$DB_DATABASE_PORT_NUMBER" + echo "SELECT 1" | mysql_execute "mysql" "$MYSQL_CLIENT_DATABASE_ROOT_USER" "$MYSQL_CLIENT_DATABASE_ROOT_PASSWORD" "-h" "$MYSQL_CLIENT_DATABASE_HOST" "-P" "$MYSQL_CLIENT_DATABASE_PORT_NUMBER" } if ! retry_while "check_mysql_connection"; then error "Could not connect to the database server" @@ -94,20 +94,20 @@ mysql_client_initialize() { fi fi # Ensure a database user exists in the server - if [[ -n "$DB_CREATE_DATABASE_USER" ]]; then - info "Creating database user ${DB_CREATE_DATABASE_USER}" - local -a args=("$DB_CREATE_DATABASE_USER" "--host" "$DB_DATABASE_HOST" "--port" "$DB_DATABASE_PORT_NUMBER") - [[ -n "$DB_CREATE_DATABASE_PASSWORD" ]] && args+=("-p" "$DB_CREATE_DATABASE_PASSWORD") - [[ -n "$DB_DATABASE_AUTHENTICATION_PLUGIN" ]] && args+=("--auth-plugin" "$DB_DATABASE_AUTHENTICATION_PLUGIN") + if [[ -n "$MYSQL_CLIENT_CREATE_DATABASE_USER" ]]; then + info "Creating database user ${MYSQL_CLIENT_CREATE_DATABASE_USER}" + local -a args=("$MYSQL_CLIENT_CREATE_DATABASE_USER" "--host" "$MYSQL_CLIENT_DATABASE_HOST" "--port" "$MYSQL_CLIENT_DATABASE_PORT_NUMBER") + [[ -n "$MYSQL_CLIENT_CREATE_DATABASE_PASSWORD" ]] && args+=("-p" "$MYSQL_CLIENT_CREATE_DATABASE_PASSWORD") + [[ -n "$MYSQL_CLIENT_DATABASE_AUTHENTICATION_PLUGIN" ]] && args+=("--auth-plugin" "$MYSQL_CLIENT_DATABASE_AUTHENTICATION_PLUGIN") mysql_ensure_optional_user_exists "${args[@]}" fi # Ensure a database exists in the server (and that the user has write privileges, if specified) - if [[ -n "$DB_CREATE_DATABASE_NAME" ]]; then - info "Creating database ${DB_CREATE_DATABASE_NAME}" - local -a createdb_args=("$DB_CREATE_DATABASE_NAME" "--host" "$DB_DATABASE_HOST" "--port" "$DB_DATABASE_PORT_NUMBER") - [[ -n "$DB_CREATE_DATABASE_USER" ]] && createdb_args+=("-u" "$DB_CREATE_DATABASE_USER") - [[ -n "$DB_CREATE_DATABASE_CHARACTER_SET" ]] && createdb_args+=("--character-set" "$DB_CREATE_DATABASE_CHARACTER_SET") - [[ -n "$DB_CREATE_DATABASE_COLLATE" ]] && createdb_args+=("--collate" "$DB_CREATE_DATABASE_COLLATE") + if [[ -n "$MYSQL_CLIENT_CREATE_DATABASE_NAME" ]]; then + info "Creating database ${MYSQL_CLIENT_CREATE_DATABASE_NAME}" + local -a createdb_args=("$MYSQL_CLIENT_CREATE_DATABASE_NAME" "--host" "$MYSQL_CLIENT_DATABASE_HOST" "--port" "$MYSQL_CLIENT_DATABASE_PORT_NUMBER") + [[ -n "$MYSQL_CLIENT_CREATE_DATABASE_USER" ]] && createdb_args+=("-u" "$MYSQL_CLIENT_CREATE_DATABASE_USER") + [[ -n "$MYSQL_CLIENT_CREATE_DATABASE_CHARACTER_SET" ]] && createdb_args+=("--character-set" "$MYSQL_CLIENT_CREATE_DATABASE_CHARACTER_SET") + [[ -n "$MYSQL_CLIENT_CREATE_DATABASE_COLLATE" ]] && createdb_args+=("--collate" "$MYSQL_CLIENT_CREATE_DATABASE_COLLATE") mysql_ensure_optional_database_exists "${createdb_args[@]}" fi } @@ -115,15 +115,15 @@ mysql_client_initialize() { ######################## # Wrap binary to force the usage of SSL # Globals: -# DB_* +# MYSQL_CLIENT_* # Arguments: # None # Returns: # None ######################### mysql_client_wrap_binary_for_ssl() { - local -r wrapper_file="${DB_BIN_DIR}/mysql" - local -r wrapped_binary_file="${DB_BASE_DIR}/.bin/mysql" + local -r wrapper_file="${MYSQL_CLIENT_BIN_DIR}/mysql" + local -r wrapped_binary_file="${MYSQL_CLIENT_BASE_DIR}/.bin/mysql" local -a ssl_opts=() read -r -a ssl_opts <<< "$(mysql_client_extra_opts)" @@ -135,6 +135,10 @@ EOF chmod +x "$wrapper_file" } +#!/bin/bash +# +# Library for mysql common + ######################## # Extract mysql version from version string # Globals: @@ -149,7 +153,7 @@ mysql_get_version() { local -a ver_split ver_string=$("${DB_BIN_DIR}/mysql" "--version") - ver_split=(${ver_string// / }) + read -r -a ver_split <<< "$ver_string" if [[ "$ver_string" = *" Distrib "* ]]; then echo "${ver_split[4]::-1}" diff --git a/bitnami/joomla/3/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh b/bitnami/joomla/3/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh index de6600ffb0ed..d074ba93e4cf 100644 --- a/bitnami/joomla/3/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh +++ b/bitnami/joomla/3/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh @@ -38,6 +38,11 @@ mysql_env_vars=( MYSQL_CLIENT_SSL_CERT_FILE MYSQL_CLIENT_SSL_KEY_FILE MYSQL_CLIENT_EXTRA_FLAGS + MARIADB_AUTHENTICATION_PLUGIN + MARIADB_HOST + MARIADB_PORT_NUMBER + MARIADB_ROOT_USER + MARIADB_ROOT_PASSWORD ) for env_var in "${mysql_env_vars[@]}"; do file_env_var="${env_var}_FILE" @@ -71,14 +76,19 @@ export PATH="${DB_SBIN_DIR}:${DB_BIN_DIR}:/opt/bitnami/common/bin:${PATH}" export DB_DAEMON_USER="mysql" export DB_DAEMON_GROUP="mysql" export ALLOW_EMPTY_PASSWORD="${ALLOW_EMPTY_PASSWORD:-no}" +MYSQL_CLIENT_DATABASE_AUTHENTICATION_PLUGIN="${MYSQL_CLIENT_DATABASE_AUTHENTICATION_PLUGIN:-"${MARIADB_AUTHENTICATION_PLUGIN:-}"}" export MYSQL_CLIENT_DATABASE_AUTHENTICATION_PLUGIN="${MYSQL_CLIENT_DATABASE_AUTHENTICATION_PLUGIN:-}" -export DB_DATABASE_AUTHENTICATION_PLUGIN="$MYSQL_CLIENT_DATABASE_AUTHENTICATION_PLUGIN" +export DB_AUTHENTICATION_PLUGIN="$MYSQL_CLIENT_DATABASE_AUTHENTICATION_PLUGIN" +MYSQL_CLIENT_DATABASE_HOST="${MYSQL_CLIENT_DATABASE_HOST:-"${MARIADB_HOST:-}"}" export MYSQL_CLIENT_DATABASE_HOST="${MYSQL_CLIENT_DATABASE_HOST:-mariadb}" -export DB_DATABASE_HOST="$MYSQL_CLIENT_DATABASE_HOST" +export DB_HOST="$MYSQL_CLIENT_DATABASE_HOST" +MYSQL_CLIENT_DATABASE_PORT_NUMBER="${MYSQL_CLIENT_DATABASE_PORT_NUMBER:-"${MARIADB_PORT_NUMBER:-}"}" export MYSQL_CLIENT_DATABASE_PORT_NUMBER="${MYSQL_CLIENT_DATABASE_PORT_NUMBER:-3306}" -export DB_DATABASE_PORT_NUMBER="$MYSQL_CLIENT_DATABASE_PORT_NUMBER" +export DB_PORT_NUMBER="$MYSQL_CLIENT_DATABASE_PORT_NUMBER" +MYSQL_CLIENT_DATABASE_ROOT_USER="${MYSQL_CLIENT_DATABASE_ROOT_USER:-"${MARIADB_ROOT_USER:-}"}" export MYSQL_CLIENT_DATABASE_ROOT_USER="${MYSQL_CLIENT_DATABASE_ROOT_USER:-root}" export DB_ROOT_USER="$MYSQL_CLIENT_DATABASE_ROOT_USER" # only used during the first initialization +MYSQL_CLIENT_DATABASE_ROOT_PASSWORD="${MYSQL_CLIENT_DATABASE_ROOT_PASSWORD:-"${MARIADB_ROOT_PASSWORD:-}"}" export MYSQL_CLIENT_DATABASE_ROOT_PASSWORD="${MYSQL_CLIENT_DATABASE_ROOT_PASSWORD:-}" export DB_ROOT_PASSWORD="$MYSQL_CLIENT_DATABASE_ROOT_PASSWORD" # only used during the first initialization export MYSQL_CLIENT_CREATE_DATABASE_NAME="${MYSQL_CLIENT_CREATE_DATABASE_NAME:-}" diff --git a/bitnami/joomla/3/debian-10/rootfs/post-init.d/shell.sh b/bitnami/joomla/3/debian-10/rootfs/post-init.d/shell.sh index 665152ba8b6f..7b244a71294c 100755 --- a/bitnami/joomla/3/debian-10/rootfs/post-init.d/shell.sh +++ b/bitnami/joomla/3/debian-10/rootfs/post-init.d/shell.sh @@ -2,8 +2,7 @@ # # Executes custom Bash init scripts -# shellcheck disable=SC1090 -# shellcheck disable=SC1091 +# shellcheck disable=SC1090,SC1091 set -o errexit set -o nounset diff --git a/bitnami/joomla/README.md b/bitnami/joomla/README.md index 6e6a42495e3c..f5e9120e0899 100644 --- a/bitnami/joomla/README.md +++ b/bitnami/joomla/README.md @@ -41,7 +41,7 @@ Non-root container images add an extra layer of security and are generally recom Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). -* [`3`, `3-debian-10`, `3.9.25`, `3.9.25-debian-10-r33`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-joomla/blob/3.9.25-debian-10-r33/3/debian-10/Dockerfile) +* [`3`, `3-debian-10`, `3.9.25`, `3.9.25-debian-10-r34`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-joomla/blob/3.9.25-debian-10-r34/3/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/joomla GitHub repo](https://github.com/bitnami/bitnami-docker-joomla). diff --git a/bitnami/joomla/docker-compose.yml b/bitnami/joomla/docker-compose.yml index 220b25125157..f344e2554fc2 100644 --- a/bitnami/joomla/docker-compose.yml +++ b/bitnami/joomla/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: mariadb: - image: 'docker.io/bitnami/mariadb:10.3-debian-10' + image: docker.io/bitnami/mariadb:10.3 environment: - ALLOW_EMPTY_PASSWORD=yes - MARIADB_USER=bn_joomla @@ -9,7 +9,7 @@ services: volumes: - 'mariadb_data:/bitnami/mariadb' joomla: - image: 'docker.io/bitnami/joomla:3-debian-10' + image: docker.io/bitnami/joomla:3 ports: - '80:8080' - '443:8443'