From bdd628c8601d1628817607ca8532c47012e1810d Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 1 Sep 2022 21:50:21 +0200 Subject: [PATCH] [bitnami/phpmyadmin] Release 5.2.0-debian-11-r33 (#4850) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- bitnami/phpmyadmin/5/debian-11/Dockerfile | 58 ++++++++++++++--- .../opt/bitnami/.bitnami_components.json | 8 +-- .../opt/bitnami/scripts/libcomponent.sh | 65 ------------------- bitnami/phpmyadmin/README.md | 2 +- 4 files changed, 55 insertions(+), 78 deletions(-) delete mode 100644 bitnami/phpmyadmin/5/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh diff --git a/bitnami/phpmyadmin/5/debian-11/Dockerfile b/bitnami/phpmyadmin/5/debian-11/Dockerfile index bf240c283faa..cbeed79f1216 100644 --- a/bitnami/phpmyadmin/5/debian-11/Dockerfile +++ b/bitnami/phpmyadmin/5/debian-11/Dockerfile @@ -6,7 +6,7 @@ ENV HOME="/" \ LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="5.2.0-debian-11-r32" \ + org.opencontainers.image.ref.name="5.2.0-debian-11-r33" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/phpmyadmin" \ org.opencontainers.image.title="phpmyadmin" \ org.opencontainers.image.vendor="VMware, Inc." \ @@ -16,13 +16,55 @@ COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl git gzip libaudit1 libbrotli1 libbsd0 libbz2-1.0 libc6 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 sqlite3 tar zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "8.0.22-5" --checksum 038fe4b2a28bb02ffbe2c7f47ed7802b39a5255dc73f4037974cc4917d3b3c23 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.54-155" --checksum 28b4021842650460745bdf6985972c6ec32ef2698240ff610ce6a94412b5bfcd -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.6.9-1" --checksum 14ae2f6d8d5f4e3a9e4cf62d5a3da80587a20651a5920dbc4ac89afdaf06f8c0 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "8.0.22-2" --checksum f74ecec61ba27db80dbd174ef6b0b2c30351f508119e3e61534830083bbec1de -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.3-153" --checksum c1f2cdabdcc920512e8936ab2c8a033e1aeb97801fa026f0b12432581bf849ae -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "phpmyadmin" "5.2.0-153" --checksum 9cdf3163d9f943c78d5e818ddafa519984bd10f8f0761c0dfe488946d2a4b413 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-154" --checksum e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab +RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ + if [ ! -f php-8.0.23-0-linux-amd64-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/php-8.0.23-0-linux-amd64-debian-11.tar.gz -O ; \ + fi && \ + echo "a13feed8bb37bccf5c842290bb108095e7f4284acedb87a8633a9425b767cb18 php-8.0.23-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf php-8.0.23-0-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf php-8.0.23-0-linux-amd64-debian-11.tar.gz +RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ + if [ ! -f apache-2.4.54-155-linux-amd64-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/apache-2.4.54-155-linux-amd64-debian-11.tar.gz -O ; \ + fi && \ + echo "28b4021842650460745bdf6985972c6ec32ef2698240ff610ce6a94412b5bfcd apache-2.4.54-155-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf apache-2.4.54-155-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf apache-2.4.54-155-linux-amd64-debian-11.tar.gz +RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ + if [ ! -f mysql-client-10.6.9-1-linux-amd64-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/mysql-client-10.6.9-1-linux-amd64-debian-11.tar.gz -O ; \ + fi && \ + echo "14ae2f6d8d5f4e3a9e4cf62d5a3da80587a20651a5920dbc4ac89afdaf06f8c0 mysql-client-10.6.9-1-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf mysql-client-10.6.9-1-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf mysql-client-10.6.9-1-linux-amd64-debian-11.tar.gz +RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ + if [ ! -f libphp-8.0.23-0-linux-amd64-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/libphp-8.0.23-0-linux-amd64-debian-11.tar.gz -O ; \ + fi && \ + echo "76cbb5156e406bc38a0816d3a70b21326ac12a546e5279d9be6d38e2be493060 libphp-8.0.23-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf libphp-8.0.23-0-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf libphp-8.0.23-0-linux-amd64-debian-11.tar.gz +RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ + if [ ! -f render-template-1.0.3-153-linux-amd64-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/render-template-1.0.3-153-linux-amd64-debian-11.tar.gz -O ; \ + fi && \ + echo "c1f2cdabdcc920512e8936ab2c8a033e1aeb97801fa026f0b12432581bf849ae render-template-1.0.3-153-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf render-template-1.0.3-153-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf render-template-1.0.3-153-linux-amd64-debian-11.tar.gz +RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ + if [ ! -f phpmyadmin-5.2.0-153-linux-amd64-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/phpmyadmin-5.2.0-153-linux-amd64-debian-11.tar.gz -O ; \ + fi && \ + echo "9cdf3163d9f943c78d5e818ddafa519984bd10f8f0761c0dfe488946d2a4b413 phpmyadmin-5.2.0-153-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf phpmyadmin-5.2.0-153-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf phpmyadmin-5.2.0-153-linux-amd64-debian-11.tar.gz +RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ + if [ ! -f gosu-1.14.0-154-linux-amd64-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-amd64-debian-11.tar.gz -O ; \ + fi && \ + echo "e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab gosu-1.14.0-154-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf gosu-1.14.0-154-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf gosu-1.14.0-154-linux-amd64-debian-11.tar.gz RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami diff --git a/bitnami/phpmyadmin/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/phpmyadmin/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 1b660558e9d4..e47d73de1c8a 100644 --- a/bitnami/phpmyadmin/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/phpmyadmin/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -15,10 +15,10 @@ }, "libphp": { "arch": "amd64", - "digest": "f74ecec61ba27db80dbd174ef6b0b2c30351f508119e3e61534830083bbec1de", + "digest": "76cbb5156e406bc38a0816d3a70b21326ac12a546e5279d9be6d38e2be493060", "distro": "debian-11", "type": "NAMI", - "version": "8.0.22-2" + "version": "8.0.23-0" }, "mysql-client": { "arch": "amd64", @@ -29,10 +29,10 @@ }, "php": { "arch": "amd64", - "digest": "038fe4b2a28bb02ffbe2c7f47ed7802b39a5255dc73f4037974cc4917d3b3c23", + "digest": "a13feed8bb37bccf5c842290bb108095e7f4284acedb87a8633a9425b767cb18", "distro": "debian-11", "type": "NAMI", - "version": "8.0.22-5" + "version": "8.0.23-0" }, "phpmyadmin": { "arch": "amd64", diff --git a/bitnami/phpmyadmin/5/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh b/bitnami/phpmyadmin/5/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh deleted file mode 100644 index a7b60696daa6..000000000000 --- a/bitnami/phpmyadmin/5/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -# -# Library for managing Bitnami components - -# Constants -CACHE_ROOT="/tmp/bitnami/pkg/cache" -DOWNLOAD_URL="https://downloads.bitnami.com/files/stacksmith" - -# Functions - -######################## -# Download and unpack a Bitnami package -# Globals: -# OS_NAME -# OS_ARCH -# OS_FLAVOUR -# Arguments: -# $1 - component's name -# $2 - component's version -# Returns: -# None -######################### -component_unpack() { - local name="${1:?name is required}" - local version="${2:?version is required}" - local base_name="${name}-${version}-${OS_NAME}-${OS_ARCH}-${OS_FLAVOUR}" - local package_sha256="" - local directory="/opt/bitnami" - - # Validate arguments - shift 2 - while [ "$#" -gt 0 ]; do - case "$1" in - -c|--checksum) - shift - package_sha256="${1:?missing package checksum}" - ;; - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; - esac - shift - done - - echo "Downloading $base_name package" - if [ -f "${CACHE_ROOT}/${base_name}.tar.gz" ]; then - echo "${CACHE_ROOT}/${base_name}.tar.gz already exists, skipping download." - cp "${CACHE_ROOT}/${base_name}.tar.gz" . - rm "${CACHE_ROOT}/${base_name}.tar.gz" - if [ -f "${CACHE_ROOT}/${base_name}.tar.gz.sha256" ]; then - echo "Using the local sha256 from ${CACHE_ROOT}/${base_name}.tar.gz.sha256" - package_sha256="$(< "${CACHE_ROOT}/${base_name}.tar.gz.sha256")" - rm "${CACHE_ROOT}/${base_name}.tar.gz.sha256" - fi - else - curl --remote-name --silent --show-error --fail "${DOWNLOAD_URL}/${base_name}.tar.gz" - fi - if [ -n "$package_sha256" ]; then - echo "Verifying package integrity" - echo "$package_sha256 ${base_name}.tar.gz" | sha256sum --check - || return "$?" - fi - tar --directory "${directory}" --extract --gunzip --file "${base_name}.tar.gz" --no-same-owner --strip-components=2 || return "$?" - rm "${base_name}.tar.gz" -} diff --git a/bitnami/phpmyadmin/README.md b/bitnami/phpmyadmin/README.md index 737dd3ab53a6..0dfa041bdc6f 100644 --- a/bitnami/phpmyadmin/README.md +++ b/bitnami/phpmyadmin/README.md @@ -39,7 +39,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.dev/) 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`, `5-debian-11`, `5.2.0`, `5.2.0-debian-11-r32`, `latest` (5/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/phpmyadmin/5/debian-11/Dockerfile) +* [`5`, `5-debian-11`, `5.2.0`, `5.2.0-debian-11-r33`, `latest` (5/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/phpmyadmin/5/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).