2.7.1-debian-10-r0 release

2/debian-10/Dockerfile

@@ -10,21 +10,21 @@ COPY prebuildfs /
 # Install required system packages and dependencies
 RUN install_packages acl advancecomp ca-certificates curl file ghostscript gifsicle gzip hostname imagemagick jhead jpegoptim libbsd0 libbz2-1.0 libc6 libcom-err2 libcurl4 libedit2 libffi6 libgcc1 libgcrypt20 libgmp-dev libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu63 libidn2-0 libjpeg-turbo-progs libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libncurses6 libncursesw6 libnettle6 libnghttp2-14 libp11-kit0 libpq5 libpsl5 libreadline-dev libreadline7 librtmp1 libsasl2-2 libsqlite3-0 libssh2-1 libssl-dev libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxml2-dev libxslt1-dev libxslt1.1 optipng pngcrush pngquant procps rsync sqlite3 tar zlib1g zlib1g-dev
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wait-for-port" "1.0.0-3" --checksum 7521d9a4f9e4e182bf32977e234026caa7b03759799868335bccb1edd8f8fd12
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "uglify-js" "3.13.1-0" --checksum 0e8396efc4c2b545d48d25da5ecb42150d7035fb4fa4bc514249214c0b47048d
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "uglify-js" "3.13.9-0" --checksum 0633e9c43248da7ae3ea786c0c4d5d51a2610700dda104f8f8bad1eea9f893d6
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "ruby" "2.7.3-0" --checksum 2d90de24a8b55a41379330d94c075beefed4f657de5edbb6d89c350b7e1b69aa
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "postgresql-client" "13.3.0-0" --checksum 1202c736e3c5b28de1dd1deb05eb2d68bd7ebccc54c9ed1eab05220f346456c3
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "node" "14.17.0-0" --checksum 445d6ffbde4c69c382f1d1614f014fb29c716756e6e91e9d5792bfb5268ea4d1
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "git" "2.31.1-1" --checksum 81233bbb8e724b9fcc0f451a61d5120fdc101a26b40bb82307eaa2b694cdd789
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "git" "2.32.0-0" --checksum 3094f50c904e966bd6c6a2d6152cf41fd3a816d32395622a785ccbcda62b7c5f
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "brotli" "1.0.9-0" --checksum 710dd6f5c97af313d0e867e793bedc013aebe173f9c28d0fabc09a16d3100ab6
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-2" --checksum 4d858ac600c38af8de454c27b7f65c0074ec3069880cb16d259a6e40a46bbc50
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "discourse" "2.7.0-2" --checksum 46b20e6c7e787282160d61553ebeb6501296f1fb1b469adf70ae8df3c9e76ae4
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.13.0-0" --checksum fd7257c2736164d02832dbf72e2c1ed9d875bf3e32f0988520796bc503330129
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "discourse" "2.7.1-0" --checksum 5e2ed95b410b123aad34a37ab999b863bd302fa8ed3e482e14ba9e4cbbf4c70e
 RUN chmod g+rwX /opt/bitnami
 RUN /opt/bitnami/ruby/bin/gem install --force bundler -v '< 2'
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/discourse/postunpack.sh
 ENV BITNAMI_APP_NAME="discourse" \
-    BITNAMI_IMAGE_VERSION="2.7.0-debian-10-r4" \
+    BITNAMI_IMAGE_VERSION="2.7.1-debian-10-r0" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/ruby/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/node/bin:/opt/bitnami/python/bin:/opt/bitnami/git/bin:/opt/bitnami/brotli/bin:$PATH" \
     POSTGRESQL_CLIENT_CREATE_DATABASE_NAME="" \
     POSTGRESQL_CLIENT_CREATE_DATABASE_PASSWORD="" \

2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json

@@ -8,24 +8,24 @@
     },
     "discourse": {
         "arch": "amd64",
-        "digest": "46b20e6c7e787282160d61553ebeb6501296f1fb1b469adf70ae8df3c9e76ae4",
+        "digest": "5e2ed95b410b123aad34a37ab999b863bd302fa8ed3e482e14ba9e4cbbf4c70e",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "2.7.0-2"
+        "version": "2.7.1-0"
     },
     "git": {
         "arch": "amd64",
-        "digest": "81233bbb8e724b9fcc0f451a61d5120fdc101a26b40bb82307eaa2b694cdd789",
+        "digest": "3094f50c904e966bd6c6a2d6152cf41fd3a816d32395622a785ccbcda62b7c5f",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "2.31.1-1"
+        "version": "2.32.0-0"
     },
     "gosu": {
         "arch": "amd64",
-        "digest": "4d858ac600c38af8de454c27b7f65c0074ec3069880cb16d259a6e40a46bbc50",
+        "digest": "fd7257c2736164d02832dbf72e2c1ed9d875bf3e32f0988520796bc503330129",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "1.12.0-2"
+        "version": "1.13.0-0"
     },
     "node": {
         "arch": "amd64",
@@ -50,10 +50,10 @@
     },
     "uglify-js": {
         "arch": "amd64",
-        "digest": "0e8396efc4c2b545d48d25da5ecb42150d7035fb4fa4bc514249214c0b47048d",
+        "digest": "0633e9c43248da7ae3ea786c0c4d5d51a2610700dda104f8f8bad1eea9f893d6",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "3.13.1-0"
+        "version": "3.13.9-0"
     },
     "wait-for-port": {
         "arch": "amd64",

2/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh

@@ -177,6 +177,10 @@ web_server_reload() {
 #   --apache-before-vhost-configuration - Configuration to add before the <VirtualHost> directive (no default)
 #   --apache-allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no')
 #   --apache-extra-directory-configuration - Extra configuration for the document root directory
+#   --apache-proxy-address - Address where to proxy requests
+#   --apache-proxy-configuration - Extra configuration for the proxy
+#   --apache-proxy-http-configuration - Extra configuration for the proxy HTTP vhost
+#   --apache-proxy-https-configuration - Extra configuration for the proxy HTTPS vhost
 #   --apache-move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup
 # NGINX-specific flags:
 #   --nginx-additional-configuration - Additional server block configuration (no default)
@@ -214,6 +218,9 @@ ensure_web_server_app_configuration_exists() {
             | --apache-allow-override \
             | --apache-extra-directory-configuration \
             | --apache-proxy-address \
+            | --apache-proxy-configuration \
+            | --apache-proxy-http-configuration \
+            | --apache-proxy-https-configuration \
             | --apache-move-htaccess \
             )
                 apache_args+=("${1//apache-/}" "${2:?missing value}")

2/debian-10/rootfs/opt/bitnami/scripts/discourse/postunpack.sh

@@ -38,5 +38,9 @@ declare -a writable_dirs=(
 for dir in "${writable_dirs[@]}"; do
     ensure_dir_exists "$dir"
     # Use daemon:root ownership for compatibility when running as a non-root user
-    configure_permissions_ownership "$dir" -d "775" -f "664" -u "$DISCOURSE_DAEMON_USER" -g "$DISCOURSE_DAEMON_GROUP"
+    configure_permissions_ownership "$dir" -d "775" -f "664" -u "$DISCOURSE_DAEMON_USER" -g "root"
 done
+
+# 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"

2/debian-10/rootfs/opt/bitnami/scripts/discourse/updatehost.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# shellcheck disable=SC1091
+# shellcheck disable=SC1090,SC1091
 
 set -o errexit
 set -o nounset

2/debian-10/rootfs/opt/bitnami/scripts/libdiscourse.sh

@@ -66,6 +66,13 @@ discourse_validate() {
             print_validation_error "${password_var} must be at least ${length} characters"
         fi
     }
+    check_valid_port() {
+        local port_var="${1:?missing port variable}"
+        local err
+        if ! err="$(validate_port "${!port_var}")"; then
+            print_validation_error "An invalid port was specified in the environment variable ${port_var}: ${err}."
+        fi
+    }
 
     # Warn users in case the configuration file is not writable
     is_file_writable "$DISCOURSE_CONF_FILE" || warn "The Discourse configuration file '${DISCOURSE_CONF_FILE}' is not writable. Configurations based on environment variables will not be applied for this file."
@@ -78,9 +85,9 @@ discourse_validate() {
     ! is_empty_value "$DISCOURSE_ENABLE_HTTPS" && check_yes_no_value "DISCOURSE_ENABLE_HTTPS"
     ! is_empty_value "$DISCOURSE_SKIP_BOOTSTRAP" && check_yes_no_value "DISCOURSE_SKIP_BOOTSTRAP"
     ! is_empty_value "$DISCOURSE_DATABASE_HOST" && check_resolved_hostname "$DISCOURSE_DATABASE_HOST"
-    ! is_empty_value "$DISCOURSE_DATABASE_PORT_NUMBER" && validate_port "$DISCOURSE_DATABASE_PORT_NUMBER"
+    ! is_empty_value "$DISCOURSE_DATABASE_PORT_NUMBER" && check_valid_port "DISCOURSE_DATABASE_PORT_NUMBER"
     ! is_empty_value "$DISCOURSE_REDIS_HOST" && check_resolved_hostname "$DISCOURSE_REDIS_HOST"
-    ! is_empty_value "$DISCOURSE_REDIS_PORT_NUMBER" && validate_port "$DISCOURSE_REDIS_PORT_NUMBER"
+    ! is_empty_value "$DISCOURSE_REDIS_PORT_NUMBER" && check_valid_port "DISCOURSE_REDIS_PORT_NUMBER"
     if ! is_file_writable "$DISCOURSE_CONF_FILE"; then
         warn "The Discourse configuration file ${DISCOURSE_CONF_FILE} is not writable. Configurations specified via environment variables will not be applied to this file."
         is_boolean_yes "$DISCOURSE_ENABLE_CONF_PERSISTENCE" && warn "The DISCOURSE_ENABLE_CONF_PERSISTENCE configuration is enabled but the ${DISCOURSE_CONF_FILE} file is not writable. The file will not be persisted."
@@ -98,9 +105,11 @@ discourse_validate() {
 
     # Validate SMTP credentials
     if ! is_empty_value "$DISCOURSE_SMTP_HOST"; then
-        for empty_env_var in "DISCOURSE_SMTP_USER" "DISCOURSE_SMTP_PASSWORD" "DISCOURSE_SMTP_PORT_NUMBER"; do
-            is_empty_value "${!empty_env_var}" && print_validation_error "The ${empty_env_var} environment variable is empty or not set."
+        for empty_env_var in "DISCOURSE_SMTP_USER" "DISCOURSE_SMTP_PASSWORD"; do
+            is_empty_value "${!empty_env_var}" && warn "The ${empty_env_var} environment variable is empty or not set."
         done
+        is_empty_value "$DISCOURSE_SMTP_PORT_NUMBER" && print_validation_error "The DISCOURSE_SMTP_PORT_NUMBER environment variable is empty or not set."
+        ! is_empty_value "$DISCOURSE_SMTP_PORT_NUMBER" && check_valid_port "DISCOURSE_SMTP_PORT_NUMBER"
         ! is_empty_value "$DISCOURSE_SMTP_PROTOCOL" && check_multi_value "DISCOURSE_SMTP_PROTOCOL" "ssl tls"
     fi
 

README.md

@@ -31,7 +31,7 @@ You can find the default credentials and available configuration options in the
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-- [`2`, `2-debian-10`, `2.7.0`, `2.7.0-debian-10-r4`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-discourse/blob/2.7.0-debian-10-r4/2/debian-10/Dockerfile)
+- [`2`, `2-debian-10`, `2.7.1`, `2.7.1-debian-10-r0`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-discourse/blob/2.7.1-debian-10-r0/2/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/discourse GitHub repo](https://github.com/bitnami/bitnami-docker-discourse).