diff --git a/bitnami/valkey/8.1/debian-12/Dockerfile b/bitnami/valkey/8.1/debian-12/Dockerfile index dcc01f390d02..ed2de71d5a6b 100644 --- a/bitnami/valkey/8.1/debian-12/Dockerfile +++ b/bitnami/valkey/8.1/debian-12/Dockerfile @@ -8,14 +8,14 @@ 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-30T16:13:10Z" \ + org.opencontainers.image.created="2025-06-11T21:30:04Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/valkey/README.md" \ - org.opencontainers.image.ref.name="8.1.1-debian-12-r2" \ + org.opencontainers.image.ref.name="8.1.2-debian-12-r0" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/valkey" \ org.opencontainers.image.title="valkey" \ org.opencontainers.image.vendor="Broadcom, Inc." \ - org.opencontainers.image.version="8.1.1" + org.opencontainers.image.version="8.1.2" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -28,8 +28,8 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libgomp1 libssl3 procps RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ - "wait-for-port-1.0.8-16-linux-${OS_ARCH}-debian-12" \ - "valkey-8.1.1-0-linux-${OS_ARCH}-debian-12" \ + "wait-for-port-1.0.8-17-linux-${OS_ARCH}-debian-12" \ + "valkey-8.1.2-0-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -46,10 +46,11 @@ RUN chmod g+rwX /opt/bitnami RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true RUN ln -s /opt/bitnami/scripts/valkey/entrypoint.sh /entrypoint.sh RUN ln -s /opt/bitnami/scripts/valkey/run.sh /run.sh +RUN uninstall_packages curl COPY rootfs / RUN /opt/bitnami/scripts/valkey/postunpack.sh -ENV APP_VERSION="8.1.1" \ +ENV APP_VERSION="8.1.2" \ BITNAMI_APP_NAME="valkey" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/valkey/bin:$PATH" diff --git a/bitnami/valkey/8.1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/valkey/8.1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index 94fa4d5280af..9d8bde1a9768 100644 --- a/bitnami/valkey/8.1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/valkey/8.1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "8.1.1-0" + "version": "8.1.2-0" }, "wait-for-port": { "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.0.8-16" + "version": "1.0.8-17" } } \ No newline at end of file diff --git a/bitnami/valkey/8.1/debian-12/prebuildfs/usr/sbin/uninstall_packages b/bitnami/valkey/8.1/debian-12/prebuildfs/usr/sbin/uninstall_packages new file mode 100755 index 000000000000..615c430e4e68 --- /dev/null +++ b/bitnami/valkey/8.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/valkey/8.1/debian-12/tags-info.yaml b/bitnami/valkey/8.1/debian-12/tags-info.yaml index 5fc43c7863e9..b88c34bbddb4 100644 --- a/bitnami/valkey/8.1/debian-12/tags-info.yaml +++ b/bitnami/valkey/8.1/debian-12/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "8.1" - 8.1-debian-12 -- 8.1.1 +- 8.1.2 - latest diff --git a/bitnami/valkey/README.md b/bitnami/valkey/README.md index 1d39c775e3e2..a99fc8049142 100644 --- a/bitnami/valkey/README.md +++ b/bitnami/valkey/README.md @@ -148,13 +148,13 @@ networks: services: valkey: - image: 'bitnami/valkey:latest' + image: bitnami/valkey:latest environment: - ALLOW_EMPTY_PASSWORD=yes networks: - app-tier myapp: - image: 'YOUR_APPLICATION_IMAGE' + image: YOUR_APPLICATION_IMAGE networks: - app-tier ``` @@ -384,7 +384,7 @@ services: - VALKEY_PORT_NUMBER=7000 ... ports: - - '7000:7000' + - 7000:7000 .... ``` @@ -448,19 +448,19 @@ version: '2' services: valkey-primary: - image: 'bitnami/valkey:latest' + image: bitnami/valkey:latest ports: - - '6379' + - 6379 environment: - VALKEY_REPLICATION_MODE=primary - VALKEY_PASSWORD=my_primary_password volumes: - - '/path/to/valkey-persistence:/bitnami' + - /path/to/valkey-persistence:/bitnami valkey-replica: - image: 'bitnami/valkey:latest' + image: bitnami/valkey:latest ports: - - '6379' + - 6379 depends_on: - valkey-primary environment: