From d13cb2df7e8808c740dd889acda5911b91e37ed3 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 9 May 2023 10:10:30 +0100 Subject: [PATCH] [bitnami/phpmyadmin] Release 5.2.1-debian-11-r27 (#33220) Signed-off-by: Bitnami Containers --- bitnami/phpmyadmin/5/debian-11/Dockerfile | 6 +++--- .../rootfs/opt/bitnami/scripts/apache/postunpack.sh | 6 ++++++ .../5/debian-11/rootfs/opt/bitnami/scripts/apache/setup.sh | 7 ++++++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/bitnami/phpmyadmin/5/debian-11/Dockerfile b/bitnami/phpmyadmin/5/debian-11/Dockerfile index b83a5efec820..1c4b741fc2ad 100644 --- a/bitnami/phpmyadmin/5/debian-11/Dockerfile +++ b/bitnami/phpmyadmin/5/debian-11/Dockerfile @@ -3,10 +3,10 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-05-06T08:16:09Z" \ + org.opencontainers.image.created="2023-05-09T08:43:06Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="5.2.1-debian-11-r26" \ + org.opencontainers.image.ref.name="5.2.1-debian-11-r27" \ org.opencontainers.image.title="phpmyadmin" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="5.2.1" @@ -19,7 +19,7 @@ ENV HOME="/" \ COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages ca-certificates curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 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 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 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps zlib1g +RUN install_packages ca-certificates curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 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 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 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 openssl procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ "php-8.1.18-1-linux-${OS_ARCH}-debian-11" \ diff --git a/bitnami/phpmyadmin/5/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh b/bitnami/phpmyadmin/5/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh index a9ed67cd2bc8..6363c82fef92 100755 --- a/bitnami/phpmyadmin/5/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh +++ b/bitnami/phpmyadmin/5/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh @@ -115,3 +115,9 @@ ln -sf apache "${BITNAMI_ROOT_DIR}/apache2" ln -sf "/dev/stdout" "${APACHE_LOGS_DIR}/access_log" ln -sf "/dev/stderr" "${APACHE_LOGS_DIR}/error_log" + +# This file is necessary for avoiding the error +# "unable to write random state" +# Source: https://stackoverflow.com/questions/94445/using-openssl-what-does-unable-to-write-random-state-mean + +touch /.rnd && chmod g+rw /.rnd diff --git a/bitnami/phpmyadmin/5/debian-11/rootfs/opt/bitnami/scripts/apache/setup.sh b/bitnami/phpmyadmin/5/debian-11/rootfs/opt/bitnami/scripts/apache/setup.sh index 131f5acba447..cc2146d0a82b 100755 --- a/bitnami/phpmyadmin/5/debian-11/rootfs/opt/bitnami/scripts/apache/setup.sh +++ b/bitnami/phpmyadmin/5/debian-11/rootfs/opt/bitnami/scripts/apache/setup.sh @@ -31,7 +31,12 @@ if [[ ! -f "${APACHE_CONF_DIR}/bitnami/certs/server.crt" ]]; then SSL_EXT="subjectAltName=DNS:example.com,DNS:www.example.com,IP:127.0.0.1" rm -f "$SSL_KEY_FILE" "$SSL_CERT_FILE" openssl genrsa -out "$SSL_KEY_FILE" 4096 - openssl req -new -sha256 -out "$SSL_CSR_FILE" -key "$SSL_KEY_FILE" -nodes -subj "$SSL_SUBJ" -addext "$SSL_EXT" + # OpenSSL version 1.0.x does not use the same parameters as OpenSSL >= 1.1.x + if [[ "$(openssl version | grep -oE "[0-9]+\.[0-9]+")" == "1.0" ]]; then + openssl req -new -sha256 -out "$SSL_CSR_FILE" -key "$SSL_KEY_FILE" -nodes -subj "$SSL_SUBJ" + else + openssl req -new -sha256 -out "$SSL_CSR_FILE" -key "$SSL_KEY_FILE" -nodes -subj "$SSL_SUBJ" -addext "$SSL_EXT" + fi openssl x509 -req -sha256 -in "$SSL_CSR_FILE" -signkey "$SSL_KEY_FILE" -out "$SSL_CERT_FILE" -days 1825 -extfile <(echo -n "$SSL_EXT") rm -f "$SSL_CSR_FILE" fi