diff --git a/bitnami/discourse/2/debian-10/Dockerfile b/bitnami/discourse/2/debian-10/Dockerfile index 1d5297c75df4..e78762561201 100644 --- a/bitnami/discourse/2/debian-10/Dockerfile +++ b/bitnami/discourse/2/debian-10/Dockerfile @@ -13,18 +13,18 @@ RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wait-for-port" " 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 "node" "14.17.1-0" --checksum 989d82a6cd0065bafccd59a681dac9417a3b0844dcaecc88ebeb8a2f69528589 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.13.0-0" --checksum fd7257c2736164d02832dbf72e2c1ed9d875bf3e32f0988520796bc503330129 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "discourse" "2.7.1-0" --checksum 5e2ed95b410b123aad34a37ab999b863bd302fa8ed3e482e14ba9e4cbbf4c70e +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "discourse" "2.7.4-0" --checksum 84b81def8f1d7d23bda9be218e4cf32d506d6079decc80c3ff700c43206b5990 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.1-debian-10-r1" \ + BITNAMI_IMAGE_VERSION="2.7.4-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="" \ diff --git a/bitnami/discourse/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/discourse/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index d77a8b34dec1..a57aee660e52 100644 --- a/bitnami/discourse/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/discourse/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -8,10 +8,10 @@ }, "discourse": { "arch": "amd64", - "digest": "5e2ed95b410b123aad34a37ab999b863bd302fa8ed3e482e14ba9e4cbbf4c70e", + "digest": "84b81def8f1d7d23bda9be218e4cf32d506d6079decc80c3ff700c43206b5990", "distro": "debian-10", "type": "NAMI", - "version": "2.7.1-0" + "version": "2.7.4-0" }, "git": { "arch": "amd64", @@ -29,10 +29,10 @@ }, "node": { "arch": "amd64", - "digest": "445d6ffbde4c69c382f1d1614f014fb29c716756e6e91e9d5792bfb5268ea4d1", + "digest": "989d82a6cd0065bafccd59a681dac9417a3b0844dcaecc88ebeb8a2f69528589", "distro": "debian-10", "type": "NAMI", - "version": "14.17.0-0" + "version": "14.17.1-0" }, "postgresql-client": { "arch": "amd64", diff --git a/bitnami/discourse/2/debian-10/rootfs/opt/bitnami/scripts/discourse-env.sh b/bitnami/discourse/2/debian-10/rootfs/opt/bitnami/scripts/discourse-env.sh index ab0629d8def3..d11b079e788f 100644 --- a/bitnami/discourse/2/debian-10/rootfs/opt/bitnami/scripts/discourse-env.sh +++ b/bitnami/discourse/2/debian-10/rootfs/opt/bitnami/scripts/discourse-env.sh @@ -135,7 +135,7 @@ export DISCOURSE_SMTP_PASSWORD="${DISCOURSE_SMTP_PASSWORD:-}" DISCOURSE_SMTP_PROTOCOL="${DISCOURSE_SMTP_PROTOCOL:-"${SMTP_PROTOCOL:-}"}" export DISCOURSE_SMTP_PROTOCOL="${DISCOURSE_SMTP_PROTOCOL:-}" DISCOURSE_SMTP_AUTH="${DISCOURSE_SMTP_AUTH:-"${SMTP_AUTH:-}"}" -export DISCOURSE_SMTP_AUTH="${DISCOURSE_SMTP_AUTH:-yes}" +export DISCOURSE_SMTP_AUTH="${DISCOURSE_SMTP_AUTH:-login}" # Database configuration export DISCOURSE_DEFAULT_DATABASE_HOST="postgresql" # only used at build time diff --git a/bitnami/discourse/2/debian-10/rootfs/opt/bitnami/scripts/libdiscourse.sh b/bitnami/discourse/2/debian-10/rootfs/opt/bitnami/scripts/libdiscourse.sh index d6e7d08358a6..7d29545f5a5d 100644 --- a/bitnami/discourse/2/debian-10/rootfs/opt/bitnami/scripts/libdiscourse.sh +++ b/bitnami/discourse/2/debian-10/rootfs/opt/bitnami/scripts/libdiscourse.sh @@ -111,6 +111,7 @@ discourse_validate() { 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" + check_multi_value "DISCOURSE_SMTP_AUTH" "plain login cram_md5" fi return "$error_code" diff --git a/bitnami/discourse/README.md b/bitnami/discourse/README.md index 7e18364fbfa1..f7ae0117fca7 100644 --- a/bitnami/discourse/README.md +++ b/bitnami/discourse/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.1`, `2.7.1-debian-10-r1`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-discourse/blob/2.7.1-debian-10-r1/2/debian-10/Dockerfile) +- [`2`, `2-debian-10`, `2.7.4`, `2.7.4-debian-10-r0`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-discourse/blob/2.7.4-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). @@ -339,7 +339,7 @@ To configure Discourse to send email using SMTP you can set the following enviro - `DISCOURSE_SMTP_USER`: SMTP account user. - `DISCOURSE_SMTP_PASSWORD`: SMTP account password. - `DISCOURSE_SMTP_PROTOCOL`: If specified, SMTP protocol to use. Allowed values: tls, ssl. No default. -- `DISCOURSE_SMTP_AUTH`: SMTP authentication method. Default: **login*. +- `DISCOURSE_SMTP_AUTH`: SMTP authentication method. Default: **login**. #### Examples