diff --git a/bitnami/discourse/2/debian-10/Dockerfile b/bitnami/discourse/2/debian-10/Dockerfile index bcd5cdb543e2..4912cf92e917 100644 --- a/bitnami/discourse/2/debian-10/Dockerfile +++ b/bitnami/discourse/2/debian-10/Dockerfile @@ -25,7 +25,7 @@ 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.8-debian-10-r36" \ + BITNAMI_IMAGE_VERSION="2.7.8-debian-10-r37" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/common/bin:/opt/bitnami/ruby/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/node/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/docker-compose.yml b/bitnami/discourse/2/debian-10/docker-compose.yml index b1c7febe8eaf..71fa237ddbee 100644 --- a/bitnami/discourse/2/debian-10/docker-compose.yml +++ b/bitnami/discourse/2/debian-10/docker-compose.yml @@ -15,7 +15,7 @@ services: # ALLOW_EMPTY_PASSWORD is recommended only for development. - ALLOW_EMPTY_PASSWORD=yes volumes: - - 'redis_data:/bitnami/discourse' + - 'redis_data:/bitnami/redis' discourse: image: docker.io/bitnami/discourse:2 ports: diff --git a/bitnami/discourse/2/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/discourse/2/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh index 0b96a0be09e0..a713bd108e15 100644 --- a/bitnami/discourse/2/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/discourse/2/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -158,7 +158,7 @@ remove_cron_conf() { # $3 - Start command # $4 - Stop command # Flags: -# --disabled - Whether to disable the monit configuration +# --disable - Whether to disable the monit configuration # Returns: # None ######################### @@ -174,9 +174,8 @@ generate_monit_conf() { shift 4 while [[ "$#" -gt 0 ]]; do case "$1" in - --disabled) - shift - disabled="$1" + --disable) + disabled="yes" ;; *) echo "Invalid command line flag ${1}" >&2 diff --git a/bitnami/discourse/2/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/discourse/2/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh index dc322c377b1b..785d883f325e 100644 --- a/bitnami/discourse/2/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/discourse/2/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh @@ -164,11 +164,14 @@ web_server_reload() { # Arguments: # $1 - App name # Flags: -# --hosts - Hosts to enable # --type - Application type, which has an effect on which configuration template to use +# --hosts - Host listen addresses +# --server-name - Server name +# --server-aliases - Server aliases # --allow-remote-connections - Whether to allow remote connections or to require local connections -# --disabled - Whether to render the file with a .disabled prefix -# --enable-https - Enable app configuration on HTTPS port +# --disable - Whether to render server configurations with a .disabled prefix +# --disable-http - Whether to render the app's HTTP server configuration with a .disabled prefix +# --disable-https - Whether to render the app's HTTPS server configuration with a .disabled prefix # --http-port - HTTP port number # --https-port - HTTPS port number # --document-root - Path to document root directory @@ -198,11 +201,18 @@ ensure_web_server_app_configuration_exists() { while [[ "$#" -gt 0 ]]; do case "$1" in # Common flags + --disable \ + | --disable-http \ + | --disable-https \ + ) + apache_args+=("$1") + nginx_args+=("$1") + ;; --hosts \ + | --server-name \ + | --server-aliases \ | --type \ | --allow-remote-connections \ - | --disabled \ - | --enable-https \ | --http-port \ | --https-port \ | --document-root \ @@ -347,8 +357,13 @@ ensure_web_server_prefix_configuration_exists() { # Arguments: # $1 - App name # Flags: -# --hosts - Hosts to enable -# --enable-https - Update HTTPS app configuration +# --hosts - Host listen addresses +# --server-name - Server name +# --server-aliases - Server aliases +# --enable-http - Enable HTTP app configuration (if not enabled already) +# --enable-https - Enable HTTPS app configuration (if not enabled already) +# --disable-http - Disable HTTP app configuration (if not disabled already) +# --disable-https - Disable HTTPS app configuration (if not disabled already) # --http-port - HTTP port number # --https-port - HTTPS port number # Returns: @@ -363,8 +378,20 @@ web_server_update_app_configuration() { while [[ "$#" -gt 0 ]]; do case "$1" in # Common flags - --hosts \ + --enable-http \ | --enable-https \ + | --disable-http \ + | --disable-https \ + ) + args+=("$1") + ;; + --hosts \ + | --server-name \ + | --server-aliases \ + | --enable-http \ + | --enable-https \ + | --disable-http \ + | --disable-https \ | --http-port \ | --https-port \ ) diff --git a/bitnami/discourse/README.md b/bitnami/discourse/README.md index 2ae4f6d2cec5..1730fed81981 100644 --- a/bitnami/discourse/README.md +++ b/bitnami/discourse/README.md @@ -33,7 +33,7 @@ $ docker-compose up -d 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.8`, `2.7.8-debian-10-r36`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-discourse/blob/2.7.8-debian-10-r36/2/debian-10/Dockerfile) +- [`2`, `2-debian-10`, `2.7.8`, `2.7.8-debian-10-r37`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-discourse/blob/2.7.8-debian-10-r37/2/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/discourse GitHub repo](https://github.com/bitnami/bitnami-docker-discourse). diff --git a/bitnami/discourse/docker-compose.yml b/bitnami/discourse/docker-compose.yml index b1c7febe8eaf..71fa237ddbee 100644 --- a/bitnami/discourse/docker-compose.yml +++ b/bitnami/discourse/docker-compose.yml @@ -15,7 +15,7 @@ services: # ALLOW_EMPTY_PASSWORD is recommended only for development. - ALLOW_EMPTY_PASSWORD=yes volumes: - - 'redis_data:/bitnami/discourse' + - 'redis_data:/bitnami/redis' discourse: image: docker.io/bitnami/discourse:2 ports: