diff --git a/bitnami/memcached/1/debian-12/Dockerfile b/bitnami/memcached/1/debian-12/Dockerfile index 37bf5de82df2..e85cec32a6b3 100644 --- a/bitnami/memcached/1/debian-12/Dockerfile +++ b/bitnami/memcached/1/debian-12/Dockerfile @@ -8,10 +8,9 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2025-05-30T15:16:26Z" \ + org.opencontainers.image.created="2025-06-29T15:46:47Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/memcached/README.md" \ - org.opencontainers.image.ref.name="1.6.38-debian-12-r7" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/memcached" \ org.opencontainers.image.title="memcached" \ org.opencontainers.image.vendor="Broadcom, Inc." \ @@ -26,7 +25,9 @@ COPY prebuildfs / SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libevent-2.1-7 libsasl2-2 libsasl2-modules libssl3 netcat-openbsd procps sasl2-bin -RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ +RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ + DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \ + mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ "memcached-1.6.38-0-linux-${OS_ARCH}-debian-12" \ ) ; \ @@ -45,6 +46,7 @@ RUN chmod g+rwX /opt/bitnami RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true RUN ln -s /opt/bitnami/scripts/memcached/entrypoint.sh /entrypoint.sh RUN ln -s /opt/bitnami/scripts/memcached/run.sh /run.sh +RUN uninstall_packages curl COPY rootfs / RUN /opt/bitnami/scripts/memcached/postunpack.sh diff --git a/bitnami/memcached/1/debian-12/prebuildfs/usr/sbin/uninstall_packages b/bitnami/memcached/1/debian-12/prebuildfs/usr/sbin/uninstall_packages new file mode 100755 index 000000000000..615c430e4e68 --- /dev/null +++ b/bitnami/memcached/1/debian-12/prebuildfs/usr/sbin/uninstall_packages @@ -0,0 +1,26 @@ +#!/bin/sh +# Copyright Broadcom, Inc. All Rights Reserved. +# SPDX-License-Identifier: APACHE-2.0 +set -eu + +n=0 +max=2 +export DEBIAN_FRONTEND=noninteractive + +until [ $n -gt $max ]; do + set +e + ( + apt-get autoremove --purge -y "$@" + ) + 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 +apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/memcached/1/debian-12/tags-info.yaml b/bitnami/memcached/1/debian-12/tags-info.yaml index d2520ebc6ab5..d1621a839da4 100644 --- a/bitnami/memcached/1/debian-12/tags-info.yaml +++ b/bitnami/memcached/1/debian-12/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: -- "1" -- 1-debian-12 -- 1.6.38 -- latest + - "1" + - 1-debian-12 + - 1.6.38 + - latest diff --git a/bitnami/memcached/README.md b/bitnami/memcached/README.md index b85cbba120f7..73b7b4415f79 100644 --- a/bitnami/memcached/README.md +++ b/bitnami/memcached/README.md @@ -118,11 +118,11 @@ networks: services: memcached: - image: 'bitnami/memcached:latest' + image: bitnami/memcached:latest networks: - app-tier myapp: - image: 'YOUR_APPLICATION_IMAGE' + image: YOUR_APPLICATION_IMAGE networks: - app-tier ```