From e3c179ff9d5bbddfe75e61db969295b656898954 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Mon, 11 Sep 2023 20:00:27 +0200
Subject: [PATCH] [bitnami/discourse] Release 3.1.0-debian-11-r0 (#48191)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/discourse/3/debian-11/Dockerfile               | 10 +++++-----
 .../prebuildfs/opt/bitnami/.bitnami_components.json    |  2 +-
 .../rootfs/opt/bitnami/scripts/discourse/postunpack.sh |  4 ++++
 bitnami/discourse/3/debian-11/tags-info.yaml           |  2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/bitnami/discourse/3/debian-11/Dockerfile b/bitnami/discourse/3/debian-11/Dockerfile
index 2d2374558d77..70ec710c43b2 100644
--- a/bitnami/discourse/3/debian-11/Dockerfile
+++ b/bitnami/discourse/3/debian-11/Dockerfile
@@ -7,13 +7,13 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-09-09T10:07:16Z" \
+      org.opencontainers.image.created="2023-09-11T16:40:33Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="3.0.6-debian-11-r26" \
+      org.opencontainers.image.ref.name="3.1.0-debian-11-r0" \
       org.opencontainers.image.title="discourse" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="3.0.6"
+      org.opencontainers.image.version="3.1.0"
 
 ENV OS_ARCH="${TARGETARCH:-amd64}" \
     OS_FLAVOUR="debian-11" \
@@ -31,7 +31,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
       "postgresql-client-15.4.0-1-linux-${OS_ARCH}-debian-11" \
       "node-18.17.1-1-linux-${OS_ARCH}-debian-11" \
       "brotli-1.1.0-0-linux-${OS_ARCH}-debian-11" \
-      "discourse-3.0.6-0-linux-${OS_ARCH}-debian-11" \
+      "discourse-3.1.0-0-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -49,7 +49,7 @@ RUN /opt/bitnami/ruby/bin/gem install --force bundler -v '< 2'
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/discourse/postunpack.sh
-ENV APP_VERSION="3.0.6" \
+ENV APP_VERSION="3.1.0" \
     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/node_modules/ember-cli/bin:$PATH"
 
diff --git a/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index b24fea7f1c1e..4dfb166b1978 100644
--- a/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -9,7 +9,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "3.0.6-0"
+        "version": "3.1.0-0"
     },
     "node": {
         "arch": "amd64",
diff --git a/bitnami/discourse/3/debian-11/rootfs/opt/bitnami/scripts/discourse/postunpack.sh b/bitnami/discourse/3/debian-11/rootfs/opt/bitnami/scripts/discourse/postunpack.sh
index 60424a6ff93a..3aea1bb3ac86 100755
--- a/bitnami/discourse/3/debian-11/rootfs/opt/bitnami/scripts/discourse/postunpack.sh
+++ b/bitnami/discourse/3/debian-11/rootfs/opt/bitnami/scripts/discourse/postunpack.sh
@@ -44,6 +44,10 @@ for dir in "${writable_dirs[@]}"; do
     configure_permissions_ownership "$dir" -d "775" -f "664" -u "$DISCOURSE_DAEMON_USER" -g "root"
 done
 
+# Gem 'sprockets' purposely includes a broken symlink, which causes permissions change to fail
+# We need to remove the broken symlink for chown to succeed
+find "${DISCOURSE_BASE_DIR}/vendor/bundle/ruby" -wholename "*/sprockets-*/test/fixtures/errors/symlink" -type l -exec rm -f {} \;
+
 # Required for running as non-root users, for persistence logic to work properly
 # Using g+rwx/g+rw instead of explicit 775/664 permissions because Discourse includes executable binaries in different subfolders
 configure_permissions_ownership "$DISCOURSE_BASE_DIR" -d "g+rwx" -f "g+rw" -u "$DISCOURSE_DAEMON_USER" -g "root"
diff --git a/bitnami/discourse/3/debian-11/tags-info.yaml b/bitnami/discourse/3/debian-11/tags-info.yaml
index aaa630b129be..15db7f979ad1 100644
--- a/bitnami/discourse/3/debian-11/tags-info.yaml
+++ b/bitnami/discourse/3/debian-11/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
 - "3"
 - 3-debian-11
-- 3.0.6
+- 3.1.0
 - latest