From 7713aa43c536073249b0a957b8cf2b12e160f316 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Tue, 9 May 2023 19:57:14 +0100
Subject: [PATCH] [bitnami/discourse] Release 3.0.3-debian-11-r7 (#33298)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/discourse/3/debian-11/Dockerfile        |  6 +++---
 .../opt/bitnami/.bitnami_components.json        |  2 +-
 .../rootfs/opt/bitnami/scripts/discourse-env.sh |  1 -
 .../opt/bitnami/scripts/discourse/postunpack.sh |  3 ---
 .../rootfs/opt/bitnami/scripts/libdiscourse.sh  | 17 -----------------
 5 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/bitnami/discourse/3/debian-11/Dockerfile b/bitnami/discourse/3/debian-11/Dockerfile
index 0d3c57e6c551..52ae9200b49b 100644
--- a/bitnami/discourse/3/debian-11/Dockerfile
+++ b/bitnami/discourse/3/debian-11/Dockerfile
@@ -3,10 +3,10 @@ FROM docker.io/bitnami/minideb:bullseye
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-05-07T00:26:08Z" \
+      org.opencontainers.image.created="2023-05-09T16:48:43Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="3.0.3-debian-11-r6" \
+      org.opencontainers.image.ref.name="3.0.3-debian-11-r7" \
       org.opencontainers.image.title="discourse" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="3.0.3"
@@ -28,7 +28,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
       "postgresql-client-15.2.0-4-linux-${OS_ARCH}-debian-11" \
       "node-18.16.0-0-linux-${OS_ARCH}-debian-11" \
       "brotli-1.0.9-160-linux-${OS_ARCH}-debian-11" \
-      "discourse-3.0.3-0-linux-${OS_ARCH}-debian-11" \
+      "discourse-3.0.3-1-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
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 b2d0bdeea421..d39b603cb6d5 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.3-0"
+        "version": "3.0.3-1"
     },
     "node": {
         "arch": "amd64",
diff --git a/bitnami/discourse/3/debian-11/rootfs/opt/bitnami/scripts/discourse-env.sh b/bitnami/discourse/3/debian-11/rootfs/opt/bitnami/scripts/discourse-env.sh
index 5f8b08149467..7cc9f027327b 100644
--- a/bitnami/discourse/3/debian-11/rootfs/opt/bitnami/scripts/discourse-env.sh
+++ b/bitnami/discourse/3/debian-11/rootfs/opt/bitnami/scripts/discourse-env.sh
@@ -95,7 +95,6 @@ export DISCOURSE_BASE_DIR="${BITNAMI_ROOT_DIR}/discourse"
 export DISCOURSE_CONF_FILE="${DISCOURSE_BASE_DIR}/config/discourse.conf"
 export PATH="${BITNAMI_ROOT_DIR}/common/bin:${BITNAMI_ROOT_DIR}/brotli/bin:${BITNAMI_ROOT_DIR}/git/bin:${PATH}"
 export YARN_CACHE_FOLDER="${DISCOURSE_BASE_DIR}/tmp/cache"
-export PASSENGER_NATIVE_SUPPORT_OUTPUT_DIR="${BITNAMI_ROOT_DIR}/ruby/lib"
 
 # Discourse persistence configuration
 export DISCOURSE_VOLUME_DIR="${BITNAMI_VOLUME_DIR}/discourse"
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 69231e401e37..5b273734c4f3 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
@@ -42,9 +42,6 @@ for dir in "${writable_dirs[@]}"; do
     configure_permissions_ownership "$dir" -d "775" -f "664" -u "$DISCOURSE_DAEMON_USER" -g "root"
 done
 
-# Install the passenger-native-support-library
-install_native_support_library
-
 # 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/rootfs/opt/bitnami/scripts/libdiscourse.sh b/bitnami/discourse/3/debian-11/rootfs/opt/bitnami/scripts/libdiscourse.sh
index 081e6003a362..ea2a984fdf3d 100644
--- a/bitnami/discourse/3/debian-11/rootfs/opt/bitnami/scripts/libdiscourse.sh
+++ b/bitnami/discourse/3/debian-11/rootfs/opt/bitnami/scripts/libdiscourse.sh
@@ -455,20 +455,3 @@ discourse_set_hostname() {
     fi
     discourse_conf_set "hostname" "$discourse_server_host"
 }
-
-########################
-# Install passenger native support library
-# Globals:
-#   DISCOURSE_*, BITNAMI_*, PASSENGER_*
-# Arguments:
-#   None
-# Returns:
-#   None
-#########################
-install_native_support_library() {
-    local -r library_name="passenger_native_support.so"
-    local -r orig="${DISCOURSE_BASE_DIR}/lib/${library_name}"
-    local -r dest="${BITNAMI_ROOT_DIR}/ruby/lib/${library_name}"
-    debug "Installing passenger native support library into '${dest}'"
-    mv "${orig}" "${dest}"
-}