From a106e660e1f4fb9263e3a9d0dcbba7bafbdbd112 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 12 Jun 2025 11:22:03 +0200 Subject: [PATCH] [bitnami/discourse] Release 3.4.5-debian-12-r0 (#82233) Signed-off-by: Bitnami Bot --- bitnami/discourse/3/debian-12/Dockerfile | 15 ++++++----- .../opt/bitnami/.bitnami_components.json | 6 ++--- .../prebuildfs/usr/sbin/uninstall_packages | 26 +++++++++++++++++++ bitnami/discourse/3/debian-12/tags-info.yaml | 2 +- bitnami/discourse/README.md | 8 +++--- 5 files changed, 42 insertions(+), 15 deletions(-) create mode 100755 bitnami/discourse/3/debian-12/prebuildfs/usr/sbin/uninstall_packages diff --git a/bitnami/discourse/3/debian-12/Dockerfile b/bitnami/discourse/3/debian-12/Dockerfile index ca7d7ad661e4..6ad17771bd03 100644 --- a/bitnami/discourse/3/debian-12/Dockerfile +++ b/bitnami/discourse/3/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-30T14:20:06Z" \ + org.opencontainers.image.created="2025-06-12T08:19:12Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/discourse/README.md" \ - org.opencontainers.image.ref.name="3.4.4-debian-12-r1" \ + org.opencontainers.image.ref.name="3.4.5-debian-12-r0" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/discourse" \ org.opencontainers.image.title="discourse" \ org.opencontainers.image.vendor="Broadcom, Inc." \ - org.opencontainers.image.version="3.4.4" + org.opencontainers.image.version="3.4.5" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-12" \ @@ -27,13 +27,13 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages acl advancecomp ca-certificates curl file gifsicle git hostname imagemagick jhead jpegoptim libbrotli1 libbsd0 libbz2-1.0 libcom-err2 libcrypt1 libcurl4 libedit2 libffi8 libgcc-s1 libgmp10 libgnutls30 libgssapi-krb5-2 libhogweed6 libicu72 libidn2-0 libjpeg-turbo-progs libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.5-0 liblz4-1 liblzma5 libmd0 libncursesw6 libnettle8 libnghttp2-14 libnsl2 libp11-kit0 libpcre2-8-0 libpq5 libpsl5 libreadline-dev libreadline8 librtmp1 libsasl2-2 libsqlite3-0 libssh2-1 libssl-dev libssl3 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libunistring2 libuuid1 libxml2 libxslt1.1 libyaml-0-2 libyaml-dev libzstd1 optipng pngcrush pngquant procps rsync zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ - "python-3.12.10-15-linux-${OS_ARCH}-debian-12" \ - "wait-for-port-1.0.8-16-linux-${OS_ARCH}-debian-12" \ + "python-3.12.11-3-linux-${OS_ARCH}-debian-12" \ + "wait-for-port-1.0.8-17-linux-${OS_ARCH}-debian-12" \ "ruby-3.2.8-1-linux-${OS_ARCH}-debian-12" \ "postgresql-client-17.5.0-1-linux-${OS_ARCH}-debian-12" \ "node-20.19.2-0-linux-${OS_ARCH}-debian-12" \ "brotli-1.1.0-6-linux-${OS_ARCH}-debian-12" \ - "discourse-3.4.4-0-linux-${OS_ARCH}-debian-12" \ + "discourse-3.4.5-0-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -48,10 +48,11 @@ RUN apt-get update && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true RUN /opt/bitnami/ruby/bin/gem install --force bundler -v '< 2' +RUN uninstall_packages curl COPY rootfs / RUN /opt/bitnami/scripts/discourse/postunpack.sh -ENV APP_VERSION="3.4.4" \ +ENV APP_VERSION="3.4.5" \ BITNAMI_APP_NAME="discourse" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/common/bin:/opt/bitnami/ruby/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/node/bin:/opt/bitnami/brotli/bin:/opt/bitnami/discourse/app/assets/javascripts/discourse/node_modules/ember-cli/bin:$PATH" diff --git a/bitnami/discourse/3/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/discourse/3/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index 4dace423b52d..8de586131de9 100644 --- a/bitnami/discourse/3/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/discourse/3/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -9,7 +9,7 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "3.4.4-0" + "version": "3.4.5-0" }, "node": { "arch": "amd64", @@ -27,7 +27,7 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "3.12.10-15" + "version": "3.12.11-3" }, "ruby": { "arch": "amd64", @@ -39,6 +39,6 @@ "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/discourse/3/debian-12/prebuildfs/usr/sbin/uninstall_packages b/bitnami/discourse/3/debian-12/prebuildfs/usr/sbin/uninstall_packages new file mode 100755 index 000000000000..615c430e4e68 --- /dev/null +++ b/bitnami/discourse/3/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/discourse/3/debian-12/tags-info.yaml b/bitnami/discourse/3/debian-12/tags-info.yaml index af502d88289a..65ab77df166b 100644 --- a/bitnami/discourse/3/debian-12/tags-info.yaml +++ b/bitnami/discourse/3/debian-12/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "3" - 3-debian-12 -- 3.4.4 +- 3.4.5 - latest diff --git a/bitnami/discourse/README.md b/bitnami/discourse/README.md index c8e059b1d196..1a6c26a49f44 100644 --- a/bitnami/discourse/README.md +++ b/bitnami/discourse/README.md @@ -165,25 +165,25 @@ This requires a minor change to the [`docker-compose.yml`](https://github.com/bi postgresql: ... volumes: -- - 'postgresql_data:/bitnami/postgresql' +- - postgresql_data:/bitnami/postgresql + - /path/to/postgresql-persistence:/bitnami/postgresql ... redis: ... volumes: -- - 'redis_data:/bitnami/redis' +- - redis_data:/bitnami/redis + - /path/to/redis-persistence:/bitnami/redis ... discourse: ... volumes: -- - 'discourse_data:/bitnami/discourse' +- - discourse_data:/bitnami/discourse + - /path/to/discourse-persistence:/bitnami/discourse ... sidekiq: ... volumes: -- - 'discourse_data:/bitnami/discourse' +- - discourse_data:/bitnami/discourse + - /path/to/discourse-persistence:/bitnami/discourse ... -volumes: