public_git/bitnami-containers
1
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-10-18 08:17:20 +02:00
Code Issues Projects Releases Wiki Activity

[bitnami/discourse] Release 3.0.2-debian-11-r3 (#28985)

Browse Source 
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Bitnami Bot
2023-04-01 19:30:04 +02:00
committed by GitHub
parent 8865260cf2
commit b20767cd45
4 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitnami/discourse/3/debian-11/Dockerfile
+10 -10
View File
@@ -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-03-28T06:56:32Z" \
org.opencontainers.image.created="2023-04-01T15:17:58Z" \
org.opencontainers.image.description="Application packaged by VMware, Inc" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="3.0.2-debian-11-r2" \
org.opencontainers.image.ref.name="3.0.2-debian-11-r3" \
org.opencontainers.image.title="discourse" \
org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="3.0.2"
@@ -22,14 +22,14 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN install_packages acl advancecomp ca-certificates curl file gifsicle git hostname imagemagick jhead jpegoptim libbrotli1 libbsd0 libbz2-1.0 libcom-err2 libcrypt1 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg-turbo-progs libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmd0 libncursesw6 libnettle8 libnsl2 libp11-kit0 libpq5 libreadline-dev libreadline8 libsasl2-2 libsqlite3-0 libssl-dev libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libunistring2 libuuid1 libxml2 libxslt1.1 optipng pngcrush pngquant procps rsync sqlite3 zlib1g
RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
COMPONENTS=( \
"python-3.8.16-8-linux-${OS_ARCH}-debian-11" \
"wait-for-port-1.0.6-2-linux-${OS_ARCH}-debian-11" \
"ruby-3.1.3-5-linux-${OS_ARCH}-debian-11" \
"postgresql-client-15.2.0-2-linux-${OS_ARCH}-debian-11" \
"node-18.15.0-1-linux-${OS_ARCH}-debian-11" \
"brotli-1.0.9-158-linux-${OS_ARCH}-debian-11" \
"gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \
"discourse-3.0.2-0-linux-${OS_ARCH}-debian-11" \
"python-3.8.16-9-linux-${OS_ARCH}-debian-11" \
"wait-for-port-1.0.6-4-linux-${OS_ARCH}-debian-11" \
"ruby-3.1.4-0-linux-${OS_ARCH}-debian-11" \
"postgresql-client-15.2.0-4-linux-${OS_ARCH}-debian-11" \
"node-18.15.0-3-linux-${OS_ARCH}-debian-11" \
"brotli-1.0.9-160-linux-${OS_ARCH}-debian-11" \
"gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \
"discourse-3.0.2-2-linux-${OS_ARCH}-debian-11" \
) && \
for COMPONENT in "${COMPONENTS[@]}"; do \
if [ ! -f "${COMPONENT}.tar.gz" ]; then \
bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+8 -8
View File
@@ -3,48 +3,48 @@
"arch": "amd64",
"distro": "debian-11",
"type": "NAMI",
"version": "1.0.9-158"
"version": "1.0.9-160"
},
"discourse": {
"arch": "amd64",
"distro": "debian-11",
"type": "NAMI",
"version": "3.0.2-0"
"version": "3.0.2-2"
},
"gosu": {
"arch": "amd64",
"distro": "debian-11",
"type": "NAMI",
"version": "1.16.0-3"
"version": "1.16.0-5"
},
"node": {
"arch": "amd64",
"distro": "debian-11",
"type": "NAMI",
"version": "18.15.0-1"
"version": "18.15.0-3"
},
"postgresql-client": {
"arch": "amd64",
"distro": "debian-11",
"type": "NAMI",
"version": "15.2.0-2"
"version": "15.2.0-4"
},
"python": {
"arch": "amd64",
"distro": "debian-11",
"type": "NAMI",
"version": "3.8.16-8"
"version": "3.8.16-9"
},
"ruby": {
"arch": "amd64",
"distro": "debian-11",
"type": "NAMI",
"version": "3.1.3-5"
"version": "3.1.4-0"
},
"wait-for-port": {
"arch": "amd64",
"distro": "debian-11",
"type": "NAMI",
"version": "1.0.6-2"
"version": "1.0.6-4"
}
}
bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
+9 -3
View File
@@ -279,7 +279,7 @@ remove_logrotate_conf() {
# Flags:
# --custom-service-content - Custom content to add to the [service] block
# --environment - Environment variable to define (multiple --environment options may be passed)
# --environment-file - Text file with environment variables
# --environment-file - Text file with environment variables (multiple --environment-file options may be passed)
# --exec-start - Start command (required)
# --exec-start-pre - Pre-start command (optional)
# --exec-start-post - Post-start command (optional)
@@ -330,7 +330,6 @@ generate_systemd_conf() {
| --type \
| --user \
| --group \
| --environment-file \
| --exec-start \
| --exec-stop \
| --exec-reload \
@@ -368,6 +367,12 @@ generate_systemd_conf() {
[[ -n "$environment" ]] && environment+=$'\n'
environment+="Environment=${1:?"--environment value is missing"}"
;;
--environment-file)
shift
# It is possible to add multiple environment-file lines
[[ -n "$environment_file" ]] && environment_file+=$'\n'
environment_file+="EnvironmentFile=${1:?"--environment-file value is missing"}"
;;
*)
echo "Invalid command line flag ${1}" >&2
return 1
@@ -435,7 +440,8 @@ EOF
cat >> "$service_file" <<< "$environment"
fi
if [[ -n "$environment_file" ]]; then
cat >> "$service_file" <<< "EnvironmentFile=${environment_file}"
# This variable may contain multiple EnvironmentFile= directives
cat >> "$service_file" <<< "$environment_file"
fi
# Logging
if [[ -n "$standard_output" ]]; then
bitnami/discourse/3/debian-11/rootfs/opt/bitnami/scripts/discourse/updatehost.sh
+8 -1
View File
@@ -13,5 +13,12 @@ set -o pipefail
# Load libraries
. /opt/bitnami/scripts/libdiscourse.sh
# If DISCOURSE_HOST is not provided via user-data, force value from CLI args
if [[ -z "$DISCOURSE_HOST" || "$DISCOURSE_HOST" = "www.example.com" ]]; then
DISCOURSE_DOMAIN="${1:?missing host}"
else
DISCOURSE_DOMAIN="$DISCOURSE_HOST"
fi
info "Updating configuration file"
discourse_set_hostname "${1:?missing host}"
discourse_set_hostname "$DISCOURSE_DOMAIN"