5.0.2-debian-10-r58 release

2026-03-29 16:27:49 +08:00 · 2020-05-14 17:49:27 +00:00
parent e754e0f5ed
commit 925ffc479f
7 changed files with 72 additions and 12 deletions
--- a/bitnami/phpmyadmin/5/debian-10/Dockerfile
+++ b/bitnami/phpmyadmin/5/debian-10/Dockerfile
@@ -1,15 +1,15 @@
 FROM docker.io/bitnami/minideb:buster
 LABEL maintainer "Bitnami <containers@bitnami.com>"

-ENV PATH="/opt/bitnami/apache/bin:/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/common/bin:/opt/bitnami/nami/bin:$PATH"
+ENV PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/common/bin:/opt/bitnami/nami/bin:$PATH"

 COPY prebuildfs /
 # Install required system packages and dependencies
-RUN install_packages ca-certificates curl dirmngr gnupg 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 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 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps sudo unzip zlib1g
+RUN install_packages ca-certificates curl dirmngr gnupg 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 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 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps sudo tar zlib1g
 RUN /build/bitnami-user.sh
 RUN /build/install-nami.sh
-RUN bitnami-pkg unpack apache-2.4.43-1 --checksum 35ad223096be455ce5d11b6006db6d83b5080802cead122bfa5ebebc9d29da61
 RUN bitnami-pkg unpack php-7.3.17-1 --checksum 7dd49d5a720cb3e18373b7089dece825ad06b63acabadef9129ff22128bb26c9
+RUN bitnami-pkg unpack apache-2.4.43-1 --checksum 35ad223096be455ce5d11b6006db6d83b5080802cead122bfa5ebebc9d29da61
 RUN bitnami-pkg install libphp-7.3.17-0 --checksum 6ce3a2e1ac032fa2de1205c5ad14bfa0f3288c23d0c6b960e291d2eae94d363b
 RUN bitnami-pkg install tini-0.19.0-0 --checksum 9a8ae20be31a518f042fcec359f2cf35bfdb4e2a56f2fa8ff9ef2ecaf45da80c
 RUN bitnami-pkg unpack phpmyadmin-5.0.2-1 --checksum ebc60ec030a0db3b207a5f8d80b237fd989516aa64ac3a9e189188a78fadd026
@@ -24,7 +24,7 @@ ENV APACHE_ENABLE_CUSTOM_PORTS="no" \
    APACHE_HTTPS_PORT_NUMBER="443" \
    APACHE_HTTP_PORT_NUMBER="80" \
    BITNAMI_APP_NAME="phpmyadmin" \
-    BITNAMI_IMAGE_VERSION="5.0.2-debian-10-r57" \
+    BITNAMI_IMAGE_VERSION="5.0.2-debian-10-r58" \
    DATABASE_ENABLE_SSL="no" \
    DATABASE_HOST="mariadb" \
    DATABASE_PORT_NUMBER="3306" \
@@ -34,6 +34,9 @@ ENV APACHE_ENABLE_CUSTOM_PORTS="no" \
    DATABASE_SSL_CIPHERS="" \
    DATABASE_SSL_KEY="" \
    DATABASE_SSL_VERIFY="yes" \
+    OS_ARCH="amd64" \
+    OS_FLAVOUR="debian-10" \
+    OS_NAME="linux" \
    PHPMYADMIN_ALLOW_ARBITRARY_SERVER="" \
    PHPMYADMIN_ALLOW_NO_PASSWORD="true" \
    PHP_MEMORY_LIMIT="256M" \
--- a/bitnami/phpmyadmin/5/debian-10/docker-compose.yml
+++ b/bitnami/phpmyadmin/5/debian-10/docker-compose.yml
@@ -1,13 +1,13 @@
 version: '2'
 services:
  mariadb:
-    image: 'bitnami/mariadb:10.3'
+    image: 'docker.io/bitnami/mariadb:10.3-debian-10'
    environment:
      - MARIADB_ROOT_PASSWORD=bitnami
    volumes:
      - 'mariadb_data:/bitnami'
  phpmyadmin:
-    image: 'bitnami/phpmyadmin:5'
+    image: 'docker.io/bitnami/phpmyadmin:5-debian-10'
    ports:
      - '80:80'
      - '443:443'
--- a/bitnami/phpmyadmin/5/debian-10/prebuildfs/usr/sbin/install_packages
+++ b/bitnami/phpmyadmin/5/debian-10/prebuildfs/usr/sbin/install_packages
@@ -0,0 +1,24 @@
+#!/bin/sh
+set -e
+set -u
+export DEBIAN_FRONTEND=noninteractive
+n=0
+max=2
+until [ $n -gt $max ]; do
+    set +e
+    (
+      apt-get update -qq &&
+      apt-get install -y --no-install-recommends "$@"
+    )
+    CODE=$?
+    set -e
+    if [ $CODE -eq 0 ]; then
+        break
+    fi
+    if [ $n -eq $max ]; then
+        exit $CODE
+    fi
+    echo "apt failed, retrying"
+    n=$(($n + 1))
+done
+rm -r /var/lib/apt/lists /var/cache/apt/archives
--- a/bitnami/phpmyadmin/5/debian-10/rootfs/app-entrypoint.sh
+++ b/bitnami/phpmyadmin/5/debian-10/rootfs/app-entrypoint.sh
@@ -7,7 +7,7 @@ print_welcome_page

 if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "httpd" ]]; then
    . /apache-init.sh
-    nami_initialize apache php phpmyadmin
+    nami_initialize php apache phpmyadmin
    info "Starting gosu... "
    . /post-init.sh
 fi
--- a/bitnami/phpmyadmin/5/debian-10/rootfs/post-init.sh
+++ b/bitnami/phpmyadmin/5/debian-10/rootfs/post-init.sh
@@ -2,7 +2,7 @@

 . /opt/bitnami/base/functions

-if [[ -d /docker-entrypoint-init.d ]] && [[ ! -f "/bitnami/$BITNAMI_APP_NAME/.user_scripts_initialized" ]]; then
+if [[ -d /docker-entrypoint-init.d ]] && [[ ! -f "/bitnami/phpmyadmin/.user_scripts_initialized" ]]; then
    for f in /docker-entrypoint-init.d/*; do
        failure=0
        case "$f" in
@@ -14,11 +14,44 @@ if [[ -d /docker-entrypoint-init.d ]] && [[ ! -f "/bitnami/$BITNAMI_APP_NAME/.us
                fi
                ;;

+            *.pl)
+                info "Executing $f with Perl interpreter"
+                perl "$f" || failure=$?
+                ;;
+
            *.php)
                info "Executing $f with PHP interpreter"
                php "$f" || failure=$?
                ;;

+            *.sql|*.sql.gz)
+                info "Executing $f"
+                if [[ -n "$POSTGRESQL_PASSWORD" ]]; then
+                    export PGPASSWORD=$POSTGRESQL_PASSWORD
+                fi
+                if [[ -n "${POSTGRESQL_USER:-}" ]]; then
+                    psql=( psql -U $POSTGRESQL_USER )
+                else
+                    psql=( psql -U $POSTGRESQL_USERNAME )
+                fi
+                if [[ "$f" == *".sql" ]]; then
+                    "${psql[@]}" -f "$f" || failure=$?
+                elif [[ "$f" == *".sql.gz" ]]; then
+                    gunzip -c "$f" | "${psql[@]}" || failure=$?
+                fi
+                echo
+                ;;
+
+            *.py)
+                info "Executing $f with Python interpreter"
+                python "$f" || failure=$?
+                ;;
+
+            *.rb)
+                info "Executing $f with Ruby interpreter"
+                ruby "$f" || failure=$?
+                ;;
+
            *.sql|*.sql.gz)
                info "Executing $f"
                mysql_cmd=( mysql -h "$MARIADB_HOST" -P "$MARIADB_PORT_NUMBER" -u "$MARIADB_ROOT_USER" )
@@ -42,5 +75,5 @@ if [[ -d /docker-entrypoint-init.d ]] && [[ ! -f "/bitnami/$BITNAMI_APP_NAME/.us
        fi
    done
    info "Custom scripts were executed"
-    touch "/bitnami/$BITNAMI_APP_NAME/.user_scripts_initialized"
+    touch "/bitnami/phpmyadmin/.user_scripts_initialized"
 fi
--- a/bitnami/phpmyadmin/README.md
+++ b/bitnami/phpmyadmin/README.md
@@ -36,7 +36,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy
 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/).


-* [`5-debian-10`, `5.0.2-debian-10-r57`, `5`, `5.0.2`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.0.2-debian-10-r57/5/debian-10/Dockerfile)
+* [`5-debian-10`, `5.0.2-debian-10-r58`, `5`, `5.0.2`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.0.2-debian-10-r58/5/debian-10/Dockerfile)

 Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin).

--- a/bitnami/phpmyadmin/docker-compose.yml
+++ b/bitnami/phpmyadmin/docker-compose.yml
@@ -1,13 +1,13 @@
 version: '2'
 services:
  mariadb:
-    image: 'bitnami/mariadb:10.3'
+    image: 'docker.io/bitnami/mariadb:10.3-debian-10'
    environment:
      - MARIADB_ROOT_PASSWORD=bitnami
    volumes:
      - 'mariadb_data:/bitnami'
  phpmyadmin:
-    image: 'bitnami/phpmyadmin:5'
+    image: 'docker.io/bitnami/phpmyadmin:5-debian-10'
    ports:
      - '80:80'
      - '443:443'