3.3.3-debian-10-r78 release

2026-03-11 16:07:50 +08:00 · 2021-04-20 13:23:14 +00:00
parent e70f414b66
commit 0a97b08aba
5 changed files with 26 additions and 18 deletions
--- a/bitnami/phpbb/3/debian-10/Dockerfile
+++ b/bitnami/phpbb/3/debian-10/Dockerfile
@@ -9,10 +9,10 @@ ENV HOME="/" \
 COPY prebuildfs /
 # Install required system packages and dependencies
 RUN install_packages acl ca-certificates curl gzip jq libargon2-1 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 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.3.27-11" --checksum 87f9a8240a159879343ebed39110d322569f0d7cc7cb9e6a14823d7884de4e0a
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.46-6" --checksum fb5216cb32c47100d039af1b738b2e9d48f48aac194ca9b47ffb9ea42517a9ea
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.3.27-12" --checksum 2e75ea136568340c45dad61f773844e4062da83f7b537cd5cb2241a3811b4bb6
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.46-7" --checksum cfb1835e471967ec5a6df8c622bdd907be03fb5b57b4f86f68eb7b73fe0f6be3
 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.3.27-2" --checksum 136766df799e2acb375a4b2b46eb8b7e27899287f8dd22bfd8f205d6bea3c59d
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.3.27-3" --checksum 584ad378b927b6746ba20085247fd98c7788ed3658638b1c75ce7aa34f6d307f
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.0-3" --checksum 8179ad1371c9a7d897fe3b1bf53bbe763f94edafef19acad2498dd48b3674efe
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "phpbb" "3.3.3-0" --checksum 1e3508fbbf0367d8e05520c39f345ac681ee3a0b5376fa9a2392362125412dba
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-2" --checksum 4d858ac600c38af8de454c27b7f65c0074ec3069880cb16d259a6e40a46bbc50
@@ -29,7 +29,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
    APACHE_HTTPS_PORT_NUMBER="" \
    APACHE_HTTP_PORT_NUMBER="" \
    BITNAMI_APP_NAME="phpbb" \
-    BITNAMI_IMAGE_VERSION="3.3.3-debian-10-r77" \
+    BITNAMI_IMAGE_VERSION="3.3.3-debian-10-r78" \
    MARIADB_HOST="mariadb" \
    MARIADB_PORT_NUMBER="3306" \
    MARIADB_ROOT_PASSWORD="" \
--- a/bitnami/phpbb/3/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/phpbb/3/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,10 +1,10 @@
 {
    "apache": {
        "arch": "amd64",
-        "digest": "fb5216cb32c47100d039af1b738b2e9d48f48aac194ca9b47ffb9ea42517a9ea",
+        "digest": "cfb1835e471967ec5a6df8c622bdd907be03fb5b57b4f86f68eb7b73fe0f6be3",
        "distro": "debian-10",
        "type": "NAMI",
-        "version": "2.4.46-6"
+        "version": "2.4.46-7"
    },
    "gosu": {
        "arch": "amd64",
@@ -15,10 +15,10 @@
    },
    "libphp": {
        "arch": "amd64",
-        "digest": "136766df799e2acb375a4b2b46eb8b7e27899287f8dd22bfd8f205d6bea3c59d",
+        "digest": "584ad378b927b6746ba20085247fd98c7788ed3658638b1c75ce7aa34f6d307f",
        "distro": "debian-10",
        "type": "NAMI",
-        "version": "7.3.27-2"
+        "version": "7.3.27-3"
    },
    "mysql-client": {
        "arch": "amd64",
@@ -29,10 +29,10 @@
    },
    "php": {
        "arch": "amd64",
-        "digest": "87f9a8240a159879343ebed39110d322569f0d7cc7cb9e6a14823d7884de4e0a",
+        "digest": "2e75ea136568340c45dad61f773844e4062da83f7b537cd5cb2241a3811b4bb6",
        "distro": "debian-10",
        "type": "NAMI",
-        "version": "7.3.27-11"
+        "version": "7.3.27-12"
    },
    "phpbb": {
        "arch": "amd64",
--- a/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
@@ -116,6 +116,7 @@ mysql_client_initialize() {
        [[ -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")
+        [[ -n "$MYSQL_CLIENT_CREATE_DATABASE_PRIVILEGES" ]] && createdb_args+=("--privileges" "$MYSQL_CLIENT_CREATE_DATABASE_PRIVILEGES")
        mysql_ensure_optional_database_exists "${createdb_args[@]}"
    fi
 }
@@ -736,15 +737,16 @@ EOF
 mysql_ensure_user_has_database_privileges() {
    local -r user="${1:?user is required}"
    local -r database="${2:?db is required}"
-    local -r db_host="${3:-}"
-    local -r db_port="${4:-}"
+    local -r privileges="${3:-all}"
+    local -r db_host="${4:-}"
+    local -r db_port="${5:-}"

    local -a mysql_execute_cmd=("mysql_execute")
    [[ -n "$db_host" && -n "$db_port" ]] && mysql_execute_cmd=("mysql_remote_execute" "$db_host" "$db_port")

    debug "Providing privileges to username $user on database $database"
    "${mysql_execute_cmd[@]}" "mysql" "$DB_ROOT_USER" "$DB_ROOT_PASSWORD" <<EOF
-grant all on \`$database\`.* to '$user'@'%';
+grant ${privileges} on \`${database}\`.* to '${user}'@'%';
 EOF
 }

@@ -832,6 +834,7 @@ mysql_ensure_optional_database_exists() {
    local character_set=""
    local collate=""
    local user=""
+    local privileges=""
    # For accessing an external database
    local db_host=""
    local db_port=""
@@ -860,6 +863,10 @@ mysql_ensure_optional_database_exists() {
                shift
                db_port="${1:?missing database port}"
                ;;
+            --privileges)
+                shift
+                privileges="${1:?missing privileges}"
+                ;;
            *)
                echo "Invalid command line flag $1" >&2
                return 1
@@ -876,10 +883,7 @@ mysql_ensure_optional_database_exists() {
    mysql_ensure_database_exists "${flags[@]}"

    if [[ -n "$user" ]]; then
-        local -a grant_flags=("$user" "$database")
-        [[ -n "$db_host" ]] && grant_flags+=("$db_host")
-        [[ -n "$db_port" ]] && grant_flags+=("$db_port")
-        mysql_ensure_user_has_database_privileges "${grant_flags[@]}"
+        mysql_ensure_user_has_database_privileges "$user" "$database" "$privileges" "$db_host" "$db_port"
    fi
 }

--- a/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh
+++ b/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh
@@ -33,6 +33,7 @@ mysql_env_vars=(
    MYSQL_CLIENT_CREATE_DATABASE_PASSWORD
    MYSQL_CLIENT_CREATE_DATABASE_CHARACTER_SET
    MYSQL_CLIENT_CREATE_DATABASE_COLLATE
+    MYSQL_CLIENT_CREATE_DATABASE_PRIVILEGES
    MYSQL_CLIENT_ENABLE_SSL_WRAPPER
    MYSQL_CLIENT_ENABLE_SSL
    MYSQL_CLIENT_SSL_CA_FILE
@@ -105,6 +106,8 @@ export MYSQL_CLIENT_CREATE_DATABASE_CHARACTER_SET="${MYSQL_CLIENT_CREATE_DATABAS
 export DB_CREATE_DATABASE_CHARACTER_SET="$MYSQL_CLIENT_CREATE_DATABASE_CHARACTER_SET"
 export MYSQL_CLIENT_CREATE_DATABASE_COLLATE="${MYSQL_CLIENT_CREATE_DATABASE_COLLATE:-}"
 export DB_CREATE_DATABASE_COLLATE="$MYSQL_CLIENT_CREATE_DATABASE_COLLATE"
+export MYSQL_CLIENT_CREATE_DATABASE_PRIVILEGES="${MYSQL_CLIENT_CREATE_DATABASE_PRIVILEGES:-}"
+export DB_CREATE_DATABASE_PRIVILEGES="$MYSQL_CLIENT_CREATE_DATABASE_PRIVILEGES"
 export MYSQL_CLIENT_ENABLE_SSL_WRAPPER="${MYSQL_CLIENT_ENABLE_SSL_WRAPPER:-no}"
 export DB_ENABLE_SSL_WRAPPER="$MYSQL_CLIENT_ENABLE_SSL_WRAPPER"
 export MYSQL_CLIENT_ENABLE_SSL="${MYSQL_CLIENT_ENABLE_SSL:-no}"