diff --git a/bitnami/phpmyadmin/5/debian-12/Dockerfile b/bitnami/phpmyadmin/5/debian-12/Dockerfile index e0c2fc0b3eeac..38b4eca7f3a99 100644 --- a/bitnami/phpmyadmin/5/debian-12/Dockerfile +++ b/bitnami/phpmyadmin/5/debian-12/Dockerfile @@ -7,11 +7,11 @@ 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-08-01T14:43:12Z" \ + org.opencontainers.image.created="2024-08-09T07:35:47Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/phpmyadmin/README.md" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="5.2.1-debian-12-r36" \ + org.opencontainers.image.ref.name="5.2.1-debian-12-r37" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/phpmyadmin" \ org.opencontainers.image.title="phpmyadmin" \ org.opencontainers.image.vendor="Broadcom, Inc." \ @@ -28,10 +28,10 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl 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 zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "render-template-1.0.7-2-linux-${OS_ARCH}-debian-12" \ + "render-template-1.0.7-3-linux-${OS_ARCH}-debian-12" \ "php-8.2.22-0-linux-${OS_ARCH}-debian-12" \ "apache-2.4.62-0-linux-${OS_ARCH}-debian-12" \ - "mysql-client-10.11.8-1-linux-${OS_ARCH}-debian-12" \ + "mysql-client-10.11.8-2-linux-${OS_ARCH}-debian-12" \ "libphp-8.2.22-0-linux-${OS_ARCH}-debian-12" \ "phpmyadmin-5.2.1-5-linux-${OS_ARCH}-debian-12" \ ) ; \ diff --git a/bitnami/phpmyadmin/5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/phpmyadmin/5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index 129a9ac243120..58e917f467928 100644 --- a/bitnami/phpmyadmin/5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/phpmyadmin/5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -15,7 +15,7 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "10.11.8-1" + "version": "10.11.8-2" }, "php": { "arch": "amd64", @@ -33,6 +33,6 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-3" } } \ No newline at end of file diff --git a/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/libphpmyadmin.sh b/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/libphpmyadmin.sh index 6c8c34d74d284..3f170463df07e 100644 --- a/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/libphpmyadmin.sh +++ b/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/libphpmyadmin.sh @@ -97,11 +97,11 @@ phpmyadmin_initialize() { local database_ssl_option_env_var info "Configuring SSL options" phpmyadmin_conf_set "\$cfg['Servers'][\$i]['ssl']" true yes - for database_ssl_option in ssl_key ssl_cert ssl_ca ssl_ca_path ssl_ciphers; do - database_ssl_option_env_var="DATABASE_${database_ssl_option^^}" - is_empty_value "${!database_ssl_option_env_var:-}" && continue - phpmyadmin_conf_set "\$cfg['Servers'][\$i]['${database_ssl_option}']" "${!database_ssl_option_env_var}" - done + [ -f "$DATABASE_SSL_KEY" ] && phpmyadmin_conf_set "\$cfg['Servers'][\$i]['ssl_key']" "$DATABASE_SSL_KEY" + [ -f "$DATABASE_SSL_CERT" ] && phpmyadmin_conf_set "\$cfg['Servers'][\$i]['ssl_cert']" "$DATABASE_SSL_CERT" + [ -f "$DATABASE_SSL_CA" ] && phpmyadmin_conf_set "\$cfg['Servers'][\$i]['ssl_ca']" "$DATABASE_SSL_CA" + ! is_empty_value "$DATABASE_SSL_CA_PATH" && phpmyadmin_conf_set "\$cfg['Servers'][\$i]['ssl_ca_path']" "$DATABASE_SSL_CA_PATH" + ! is_empty_value "$DATABASE_SSL_CIPHERS" && phpmyadmin_conf_set "\$cfg['Servers'][\$i]['ssl_ciphers']" "$DATABASE_SSL_CIPHERS" ! is_empty_value "$DATABASE_SSL_VERIFY" && phpmyadmin_conf_set "\$cfg['Servers'][\$i]['ssl_verify']" "$(php_convert_to_boolean "$DATABASE_SSL_VERIFY")" yes fi diff --git a/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/phpmyadmin-env.sh b/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/phpmyadmin-env.sh index 5473628f60580..92ae3807d3116 100644 --- a/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/phpmyadmin-env.sh +++ b/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/phpmyadmin-env.sh @@ -89,9 +89,10 @@ export DATABASE_DEFAULT_ALLOW_NO_PASSWORD="yes" # only used at build time DATABASE_ALLOW_NO_PASSWORD="${DATABASE_ALLOW_NO_PASSWORD:-"${PHPMYADMIN_ALLOW_NO_PASSWORD:-}"}" export DATABASE_ALLOW_NO_PASSWORD="${DATABASE_ALLOW_NO_PASSWORD:-}" export DATABASE_ENABLE_SSL="${DATABASE_ENABLE_SSL:-}" -export DATABASE_SSL_KEY="${DATABASE_SSL_KEY:-}" -export DATABASE_SSL_CERT="${DATABASE_SSL_CERT:-}" -export DATABASE_SSL_CA="${DATABASE_SSL_CA:-}" +export DATABASE_CERTS_DIR="${PHPMYADMIN_BASE_DIR}/db_certs" +export DATABASE_SSL_KEY="${DATABASE_SSL_KEY:-${DATABASE_CERTS_DIR}/server_key.pem}" +export DATABASE_SSL_CERT="${DATABASE_SSL_CERT:-${DATABASE_CERTS_DIR}/server_certificate.pem}" +export DATABASE_SSL_CA="${DATABASE_SSL_CA:-${DATABASE_CERTS_DIR}/ca_certificate.pem}" export DATABASE_SSL_CA_PATH="${DATABASE_SSL_CA_PATH:-}" export DATABASE_SSL_CIPHERS="${DATABASE_SSL_CIPHERS:-}" export DATABASE_SSL_VERIFY="${DATABASE_SSL_VERIFY:-yes}" diff --git a/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/phpmyadmin/postunpack.sh b/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/phpmyadmin/postunpack.sh index a978993c4f39a..e4143e8410452 100755 --- a/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/phpmyadmin/postunpack.sh +++ b/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/phpmyadmin/postunpack.sh @@ -23,7 +23,7 @@ set -o pipefail . /opt/bitnami/scripts/libphp.sh . /opt/bitnami/scripts/libphpmyadmin.sh -# Load web server environment and functions (after MediaWiki environment file so MODULE is not set to a wrong value) +# Load web server environment and functions (after phpMyAdmin environment file so MODULE is not set to a wrong value) . "/opt/bitnami/scripts/$(web_server_type)-env.sh" # Enable phpMyAdmin configuration file diff --git a/bitnami/phpmyadmin/README.md b/bitnami/phpmyadmin/README.md index d9d49e3023979..7a522bf3fe66f 100644 --- a/bitnami/phpmyadmin/README.md +++ b/bitnami/phpmyadmin/README.md @@ -181,9 +181,9 @@ The `bitnami/phpmyadmin:latest` tag always points to the most recent release. To | `DATABASE_PORT_NUMBER` | Database server port. | `nil` | | `DATABASE_ALLOW_NO_PASSWORD` | Whether to allow logins without a password. | `nil` | | `DATABASE_ENABLE_SSL` | Whether to enable SSL for the connection between phpMyAdmin and the MySQL server to secure the connection. | `nil` | -| `DATABASE_SSL_KEY` | Path to the client key file when using SSL. | `nil` | -| `DATABASE_SSL_CERT` | Path to the client certificate file when using SSL. | `nil` | -| `DATABASE_SSL_CA` | Path to the CA file when using SSL. | `nil` | +| `DATABASE_SSL_KEY` | Path to the client key file when using SSL. | `${DATABASE_CERTS_DIR}/server_key.pem` | +| `DATABASE_SSL_CERT` | Path to the client certificate file when using SSL. | `${DATABASE_CERTS_DIR}/server_certificate.pem` | +| `DATABASE_SSL_CA` | Path to the CA file when using SSL. | `${DATABASE_CERTS_DIR}/ca_certificate.pem` | | `DATABASE_SSL_CA_PATH` | Directory containing trusted SSL CA certificates in PEM format. | `nil` | | `DATABASE_SSL_CIPHERS` | List of allowable ciphers for connections when using SSL. | `nil` | | `DATABASE_SSL_VERIFY` | Enable SSL certificate validation. | `yes` | @@ -210,6 +210,7 @@ The `bitnami/phpmyadmin:latest` tag always points to the most recent release. To | `DATABASE_DEFAULT_HOST` | Default database server host. | `mariadb` | | `DATABASE_DEFAULT_PORT_NUMBER` | Default database server port. | `3306` | | `DATABASE_DEFAULT_ALLOW_NO_PASSWORD` | Whether to allow logins without a password. | `yes` | +| `DATABASE_CERTS_DIR` | phpMyAdmin directory for certificates. | `${PHPMYADMIN_BASE_DIR}/db_certs` | | `PHP_DEFAULT_UPLOAD_MAX_FILESIZE` | Default max PHP upload file size. | `80M` | | `PHP_DEFAULT_POST_MAX_SIZE` | Default max PHP POST size. | `80M` | | `PHP_DEFAULT_MEMORY_LIMIT` | Default PHP memory limit. | `256M` |