diff --git a/bitnami/phpmyadmin/5/debian-12/Dockerfile b/bitnami/phpmyadmin/5/debian-12/Dockerfile index 19381ffd6c3f..bd440d0e8cc9 100644 --- a/bitnami/phpmyadmin/5/debian-12/Dockerfile +++ b/bitnami/phpmyadmin/5/debian-12/Dockerfile @@ -8,7 +8,7 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2025-07-17T06:37:34Z" \ + org.opencontainers.image.created="2025-07-17T13:18:57Z" \ 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.source="https://github.com/bitnami/containers/tree/main/bitnami/phpmyadmin" \ diff --git a/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-https-vhost.conf.tpl b/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-https-vhost.conf.tpl index 589538513c9c..90f90577a62e 100644 --- a/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-https-vhost.conf.tpl +++ b/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-https-vhost.conf.tpl @@ -3,8 +3,8 @@ {{server_name_configuration}} SSLEngine on - SSLCertificateFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.crt" - SSLCertificateKeyFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.key" + SSLCertificateFile "{{APACHE_CONF_DIR}}/bitnami/certs/tls.crt" + SSLCertificateKeyFile "{{APACHE_CONF_DIR}}/bitnami/certs/tls.key" {{additional_https_configuration}} {{additional_configuration}} diff --git a/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-https-vhost.conf.tpl b/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-https-vhost.conf.tpl index 1ad938929726..f8120411fbeb 100644 --- a/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-https-vhost.conf.tpl +++ b/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-https-vhost.conf.tpl @@ -3,8 +3,8 @@ {{server_name_configuration}} SSLEngine on - SSLCertificateFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.crt" - SSLCertificateKeyFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.key" + SSLCertificateFile "{{APACHE_CONF_DIR}}/bitnami/certs/tls.crt" + SSLCertificateKeyFile "{{APACHE_CONF_DIR}}/bitnami/certs/tls.key" DocumentRoot {{document_root}} Options -Indexes +FollowSymLinks -MultiViews diff --git a/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl b/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl index 577cd461eb9d..56e05ae77c09 100644 --- a/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl +++ b/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl @@ -3,8 +3,8 @@ {{server_name_configuration}} SSLEngine on - SSLCertificateFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.crt" - SSLCertificateKeyFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.key" + SSLCertificateFile "{{APACHE_CONF_DIR}}/bitnami/certs/tls.crt" + SSLCertificateKeyFile "{{APACHE_CONF_DIR}}/bitnami/certs/tls.key" {{proxy_configuration}} {{proxy_https_configuration}} ProxyPass / {{proxy_address}} diff --git a/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-https-vhost.conf.tpl b/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-https-vhost.conf.tpl index 5aae54c37d3b..39fd34c05af3 100644 --- a/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-https-vhost.conf.tpl +++ b/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-https-vhost.conf.tpl @@ -4,8 +4,8 @@ PassengerPreStart https://localhost:{{https_port}}/ {{server_name_configuration}} SSLEngine on - SSLCertificateFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.crt" - SSLCertificateKeyFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.key" + SSLCertificateFile "{{APACHE_CONF_DIR}}/bitnami/certs/tls.crt" + SSLCertificateKeyFile "{{APACHE_CONF_DIR}}/bitnami/certs/tls.key" DocumentRoot {{document_root}} Options -Indexes +FollowSymLinks -MultiViews diff --git a/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami-ssl.conf.tpl b/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami-ssl.conf.tpl index f1d31ed3ecc3..ff6de13a321e 100644 --- a/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami-ssl.conf.tpl +++ b/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami-ssl.conf.tpl @@ -15,8 +15,8 @@ SSLSessionCacheTimeout 300 DocumentRoot "{{APACHE_BASE_DIR}}/htdocs" SSLEngine on - SSLCertificateFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.crt" - SSLCertificateKeyFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.key" + SSLCertificateFile "{{APACHE_CONF_DIR}}/bitnami/certs/tls.crt" + SSLCertificateKeyFile "{{APACHE_CONF_DIR}}/bitnami/certs/tls.key" Options Indexes FollowSymLinks diff --git a/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/apache/setup.sh b/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/apache/setup.sh index c1f6b373c1cd..fec5b36a32f5 100755 --- a/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/apache/setup.sh +++ b/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/apache/setup.sh @@ -31,11 +31,11 @@ if ! is_dir_empty "$APACHE_DEFAULT_CONF_DIR"; then fi # Generate SSL certs (without a passphrase) ensure_dir_exists "${APACHE_CONF_DIR}/bitnami/certs" -if [[ ! -f "${APACHE_CONF_DIR}/bitnami/certs/server.crt" ]]; then +if [[ ! -f "${APACHE_CONF_DIR}/bitnami/certs/tls.crt" ]]; then info "Generating sample certificates" - SSL_KEY_FILE="${APACHE_CONF_DIR}/bitnami/certs/server.key" - SSL_CERT_FILE="${APACHE_CONF_DIR}/bitnami/certs/server.crt" - SSL_CSR_FILE="${APACHE_CONF_DIR}/bitnami/certs/server.csr" + SSL_KEY_FILE="${APACHE_CONF_DIR}/bitnami/certs/tls.key" + SSL_CERT_FILE="${APACHE_CONF_DIR}/bitnami/certs/tls.crt" + SSL_CSR_FILE="${APACHE_CONF_DIR}/bitnami/certs/tls.csr" SSL_SUBJ="/CN=example.com" SSL_EXT="subjectAltName=DNS:example.com,DNS:www.example.com,IP:127.0.0.1" rm -f "$SSL_KEY_FILE" "$SSL_CERT_FILE"