From 051cac6443aac99179ccd2ec1233368f5de9afba Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Sat, 6 Jun 2020 16:45:53 +0000 Subject: [PATCH] 5.0.2-debian-10-r76 release --- bitnami/phpmyadmin/5/debian-10/Dockerfile | 4 ++-- .../prebuildfs/opt/bitnami/scripts/libcomponent.sh | 9 +++++++-- .../5/debian-10/rootfs/opt/bitnami/scripts/libapache.sh | 2 +- bitnami/phpmyadmin/README.md | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/bitnami/phpmyadmin/5/debian-10/Dockerfile b/bitnami/phpmyadmin/5/debian-10/Dockerfile index 0847c34ec587..211427ef5461 100644 --- a/bitnami/phpmyadmin/5/debian-10/Dockerfile +++ b/bitnami/phpmyadmin/5/debian-10/Dockerfile @@ -10,7 +10,7 @@ COPY prebuildfs / # Install required system packages and dependencies RUN install_packages ca-certificates curl 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 libjemalloc2 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 tar zlib1g RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.3.18-3" --checksum 3c4b811b8711b18be4b422d9102dce24146f94bbb76b2af13741fdd364ff5ded -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.43-3" --checksum 034a9cbce222218927b29626b5bb058eb95eb729a4ba52c6175858c6572b394c +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.43-4" --checksum e6929d8619f48976f9206bec14cb9634ebe8590225818eea12c27840617f53aa RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.23-0" --checksum 7af3cead7a38670bed924fbc99e20c67f6244bb5a92642adb4ab6cd307aa9a5e RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.3.18-1" --checksum 694e048842da8cf5af181dd5021a2481ff30957a28ad71c4b772f333fc128579 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.0-0" --checksum 63449e5ed4ece61d7bbeda0d173b68768d9fb444922b8ffa2e1042be20687142 @@ -29,7 +29,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \ APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ BITNAMI_APP_NAME="phpmyadmin" \ - BITNAMI_IMAGE_VERSION="5.0.2-debian-10-r75" \ + BITNAMI_IMAGE_VERSION="5.0.2-debian-10-r76" \ MARIADB_HOST="mariadb" \ MARIADB_PORT_NUMBER="3306" \ MARIADB_ROOT_PASSWORD="" \ diff --git a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh index 025288664f69..76083e1e0a1d 100644 --- a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh +++ b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh @@ -25,7 +25,8 @@ component_unpack() { 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 @@ -59,6 +60,10 @@ component_unpack() { echo "Verifying package integrity" echo "$package_sha256 ${base_name}.tar.gz" | sha256sum --check - fi - tar --directory /opt/bitnami --extract --gunzip --file "${base_name}.tar.gz" --no-same-owner --strip-components=2 "${base_name}/files/" + tar --directory "${directory}" --extract --gunzip --file "${base_name}.tar.gz" --no-same-owner --strip-components=2 "${base_name}/files/" rm "${base_name}.tar.gz" + + # Include metadata about the package + touch "${directory}/.bitnami_packages" + echo "$base_name" >> "${directory}/.bitnami_packages" } diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libapache.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libapache.sh index a9527806a0f7..70cdb7a0c0da 100644 --- a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libapache.sh +++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libapache.sh @@ -447,7 +447,7 @@ Require local ErrorDocument 403 "For security reasons, this URL is only accessible using localhost (127.0.0.1) as the hostname." # AuthType Basic # AuthName ${app} -# AuthUserFile "${APACHE_CONF_DIR}/users" +# AuthUserFile "${APACHE_BASE_DIR}/users" # Require valid-user EOF )" diff --git a/bitnami/phpmyadmin/README.md b/bitnami/phpmyadmin/README.md index 6c312fc263c6..6724ac482b18 100644 --- 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-r75`, `5`, `5.0.2`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.0.2-debian-10-r75/5/debian-10/Dockerfile) +* [`5-debian-10`, `5.0.2-debian-10-r76`, `5`, `5.0.2`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.0.2-debian-10-r76/5/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin). @@ -291,7 +291,7 @@ volumes: # Notable Changes -## 5.0.2-debian-10-r62 +## 5.0.2-debian-10-r73 - Decrease the size of the container. The configuration logic is now based on Bash scripts in the `rootfs/` folder. - The `PHPMYADMIN_ALLOW_NO_PASSWORD` environment variable has been deprecated in favor of `DATABASE_ALLOW_NO_PASSWORD`.