diff --git a/bitnami/php-fpm/7.4/debian-11/Dockerfile b/bitnami/php-fpm/7.4/debian-11/Dockerfile index 1559a47132a5..ffcd2669e71b 100644 --- a/bitnami/php-fpm/7.4/debian-11/Dockerfile +++ b/bitnami/php-fpm/7.4/debian-11/Dockerfile @@ -4,7 +4,7 @@ ARG TARGETARCH LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="7.4.30-debian-11-r43" \ + org.opencontainers.image.ref.name="7.4.30-debian-11-r44" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/php-fpm" \ org.opencontainers.image.title="php-fpm" \ org.opencontainers.image.vendor="VMware, Inc." \ @@ -27,7 +27,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ tar -zxf php-7.4.30-164-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ rm -rf php-7.4.30-164-linux-${OS_ARCH}-debian-11.tar.gz php-7.4.30-164-linux-${OS_ARCH}-debian-11.tar.gz.sha256 RUN apt-get update && apt-get upgrade -y && \ - rm -r /var/lib/apt/lists /var/cache/apt/archives + apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS 90/' /etc/login.defs && \ sed -i 's/^PASS_MIN_DAYS.*/PASS_MIN_DAYS 0/' /etc/login.defs && \ sed -i 's/sha512/sha512 minlen=8/' /etc/pam.d/common-password diff --git a/bitnami/php-fpm/7.4/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/php-fpm/7.4/debian-11/prebuildfs/usr/sbin/install_packages index c9577647443b..77857a1a57f2 100755 --- a/bitnami/php-fpm/7.4/debian-11/prebuildfs/usr/sbin/install_packages +++ b/bitnami/php-fpm/7.4/debian-11/prebuildfs/usr/sbin/install_packages @@ -1,9 +1,10 @@ #!/bin/sh -set -e -set -u -export DEBIAN_FRONTEND=noninteractive +set -eu + n=0 max=2 +export DEBIAN_FRONTEND=noninteractive + until [ $n -gt $max ]; do set +e ( @@ -21,4 +22,4 @@ until [ $n -gt $max ]; do echo "apt failed, retrying" n=$(($n + 1)) done -rm -r /var/lib/apt/lists /var/cache/apt/archives +apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/php-fpm/README.md b/bitnami/php-fpm/README.md index be9652ddd472..209cbb4924fd 100644 --- a/bitnami/php-fpm/README.md +++ b/bitnami/php-fpm/README.md @@ -37,7 +37,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`8.1`, `8.1-debian-11`, `8.1.10`, `8.1.10-debian-11-r9`, `latest` (8.1/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/php-fpm/8.1/debian-11/Dockerfile) * [`8.0`, `8.0-debian-11`, `8.0.23`, `8.0.23-debian-11-r9` (8.0/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/php-fpm/8.0/debian-11/Dockerfile) -* [`7.4`, `7.4-debian-11`, `7.4.30`, `7.4.30-debian-11-r43` (7.4/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/php-fpm/7.4/debian-11/Dockerfile) +* [`7.4`, `7.4-debian-11`, `7.4.30`, `7.4.30-debian-11-r44` (7.4/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/php-fpm/7.4/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).