From 65e4d15cdd08f589e48876220a292d6d587b67db Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 19 Mar 2020 21:29:11 +0000 Subject: [PATCH] 5.0.1-debian-10-r50 release --- bitnami/phpmyadmin/5/debian-10/Dockerfile | 8 ++++---- .../debian-10/prebuildfs/build/install-gosu.sh | 10 ---------- .../debian-10/prebuildfs/build/install-tini.sh | 17 ----------------- .../{ => opt/bitnami}/licenses/licenses.txt | 0 bitnami/phpmyadmin/README.md | 2 +- 5 files changed, 5 insertions(+), 32 deletions(-) delete mode 100755 bitnami/phpmyadmin/5/debian-10/prebuildfs/build/install-gosu.sh delete mode 100755 bitnami/phpmyadmin/5/debian-10/prebuildfs/build/install-tini.sh rename bitnami/phpmyadmin/5/debian-10/rootfs/{ => opt/bitnami}/licenses/licenses.txt (100%) diff --git a/bitnami/phpmyadmin/5/debian-10/Dockerfile b/bitnami/phpmyadmin/5/debian-10/Dockerfile index 673729d44149..86d0013d0181 100644 --- a/bitnami/phpmyadmin/5/debian-10/Dockerfile +++ b/bitnami/phpmyadmin/5/debian-10/Dockerfile @@ -5,12 +5,12 @@ ENV PATH="/opt/bitnami/apache/bin:/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/op COPY prebuildfs / # Install required system packages and dependencies -RUN install_packages ca-certificates curl dirmngr gnupg libbsd0 libbz2-1.0 libc6 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 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 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 /build/bitnami-user.sh RUN /build/install-nami.sh RUN bitnami-pkg unpack apache-2.4.41-1 --checksum 2139963ce8e8fa949271b4ac7967b783b76a4aab87dfccb8a6f6715fc96a15d1 -RUN bitnami-pkg unpack php-7.3.15-1 --checksum 720a3692688580331d524cc84c0595f0e50e96d342ad0c8880fabb6854b014b6 -RUN bitnami-pkg install libphp-7.3.15-0 --checksum c96f4cd9a52432202120b0e80b867edab40f74d7f478d46278c49d23aecd2f59 +RUN bitnami-pkg unpack php-7.3.16-0 --checksum a22f5aeeb624440e1328c333916b949705665d3973e2922c4564183c16f9daab +RUN bitnami-pkg install libphp-7.3.16-0 --checksum 54016628052dc5cfa73f7ca22874404effe184b768fb18fcc97000acac7e5080 RUN bitnami-pkg install tini-0.18.0-3 --checksum 1e9b72b6636c6a48397a18df2363b44461e87ad7f892c179a9115c7525ed9327 RUN bitnami-pkg unpack phpmyadmin-5.0.1-0 --checksum f549e035685cb1bdb768793f201a53ce54f41033df2b31f0eba1af3db8f34cd7 RUN bitnami-pkg install gosu-1.11.0-3 --checksum c18bb8bcc95aa2494793ed5a506c4d03acc82c8c60ad061d5702e0b4048f0cb1 @@ -22,7 +22,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.1-debian-10-r49" \ + BITNAMI_IMAGE_VERSION="5.0.1-debian-10-r50" \ DATABASE_ENABLE_SSL="no" \ DATABASE_HOST="mariadb" \ DATABASE_PORT_NUMBER="3306" \ diff --git a/bitnami/phpmyadmin/5/debian-10/prebuildfs/build/install-gosu.sh b/bitnami/phpmyadmin/5/debian-10/prebuildfs/build/install-gosu.sh deleted file mode 100755 index 1756700daa89..000000000000 --- a/bitnami/phpmyadmin/5/debian-10/prebuildfs/build/install-gosu.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -VERSION="1.11" -SHA256="0b843df6d86e270c5b0f5cbd3c326a04e18f4b7f9b8457fa497b0454c4b138d7" - -curl --silent -L "https://github.com/tianon/gosu/releases/download/${VERSION}/gosu-amd64" > "/usr/local/bin/gosu" -echo "$SHA256" "/usr/local/bin/gosu" | sha256sum --check -chmod u+x "/usr/local/bin/gosu" -mkdir -p "/opt/bitnami/licenses" -curl --silent -L "https://raw.githubusercontent.com/tianon/gosu/master/LICENSE" > "/opt/bitnami/licenses/gosu-${VERSION}.txt" diff --git a/bitnami/phpmyadmin/5/debian-10/prebuildfs/build/install-tini.sh b/bitnami/phpmyadmin/5/debian-10/prebuildfs/build/install-tini.sh deleted file mode 100755 index 8376a36aee5f..000000000000 --- a/bitnami/phpmyadmin/5/debian-10/prebuildfs/build/install-tini.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -GPG_KEY="595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7" -GPG_KEY_FINGERPRINT="6380 DC42 8747 F6C3 93FE ACA5 9A84 159D 7001 A4E5" -SERVERS=("ha.pool.sks-keyservers.net" "hkp://p80.pool.sks-keyservers.net:80" "keyserver.ubuntu.com" "hkp://keyserver.ubuntu.com:80" "pgp.mit.edu") -VERSION="0.13.2" - -for server in "${SERVERS[@]}"; do - gpg --keyserver "$server" --recv-keys "$GPG_KEY" && break || : -done -gpg --fingerprint "$GPG_KEY" | grep -q "$GPG_KEY_FINGERPRINT" -curl --silent -L "https://github.com/krallin/tini/releases/download/v${VERSION}/tini.asc" > "/tmp/tini.asc" -curl --silent -L "https://github.com/krallin/tini/releases/download/v${VERSION}/tini" > "/usr/local/bin/tini" -gpg --verify "/tmp/tini.asc" "/usr/local/bin/tini" -chmod +x "/usr/local/bin/tini" -mkdir -p "/opt/bitnami/licenses" -curl --silent -L "https://raw.githubusercontent.com/krallin/tini/master/LICENSE" > "/opt/bitnami/licenses/tini-${VERSION}.txt" diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/licenses/licenses.txt b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/licenses/licenses.txt similarity index 100% rename from bitnami/phpmyadmin/5/debian-10/rootfs/licenses/licenses.txt rename to bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/licenses/licenses.txt diff --git a/bitnami/phpmyadmin/README.md b/bitnami/phpmyadmin/README.md index 6f86ec25a4e7..951aef5a8e23 100644 --- a/bitnami/phpmyadmin/README.md +++ b/bitnami/phpmyadmin/README.md @@ -38,7 +38,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/containers/how-to/understand-rolling-tags-containers/). -* [`5-debian-10`, `5.0.1-debian-10-r49`, `5`, `5.0.1`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.0.1-debian-10-r49/5/debian-10/Dockerfile) +* [`5-debian-10`, `5.0.1-debian-10-r50`, `5`, `5.0.1`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.0.1-debian-10-r50/5/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin).