From 3393cd01882af738f9d5c9d8482f47f43d4fbd8e Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 19 Mar 2020 21:50:48 +0000 Subject: [PATCH] 2.4.1-debian-10-r5 release --- bitnami/discourse/2/debian-10/Dockerfile | 2 +- .../debian-10/prebuildfs/build/install-gosu.sh | 10 ---------- .../debian-10/prebuildfs/build/install-tini.sh | 17 ----------------- .../{ => opt/bitnami}/licenses/licenses.txt | 0 bitnami/discourse/README.md | 2 +- 5 files changed, 2 insertions(+), 29 deletions(-) delete mode 100755 bitnami/discourse/2/debian-10/prebuildfs/build/install-gosu.sh delete mode 100755 bitnami/discourse/2/debian-10/prebuildfs/build/install-tini.sh rename bitnami/discourse/2/debian-10/rootfs/{ => opt/bitnami}/licenses/licenses.txt (100%) diff --git a/bitnami/discourse/2/debian-10/Dockerfile b/bitnami/discourse/2/debian-10/Dockerfile index 77fcb48cb90c..4acd3d383095 100644 --- a/bitnami/discourse/2/debian-10/Dockerfile +++ b/bitnami/discourse/2/debian-10/Dockerfile @@ -22,7 +22,7 @@ RUN /opt/bitnami/ruby/bin/gem install --force bundler -v '< 2' COPY rootfs / ENV BITNAMI_APP_NAME="discourse" \ - BITNAMI_IMAGE_VERSION="2.4.1-debian-10-r4" \ + BITNAMI_IMAGE_VERSION="2.4.1-debian-10-r5" \ DISCOURSE_EMAIL="user@example.com" \ DISCOURSE_HOST="discourse" \ DISCOURSE_HOSTNAME="127.0.0.1" \ diff --git a/bitnami/discourse/2/debian-10/prebuildfs/build/install-gosu.sh b/bitnami/discourse/2/debian-10/prebuildfs/build/install-gosu.sh deleted file mode 100755 index 1756700daa89..000000000000 --- a/bitnami/discourse/2/debian-10/prebuildfs/build/install-gosu.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -VERSION="1.11" -SHA256="0b843df6d86e270c5b0f5cbd3c326a04e18f4b7f9b8457fa497b0454c4b138d7" - -curl --silent -L "https://github.com/tianon/gosu/releases/download/${VERSION}/gosu-amd64" > "/usr/local/bin/gosu" -echo "$SHA256" "/usr/local/bin/gosu" | sha256sum --check -chmod u+x "/usr/local/bin/gosu" -mkdir -p "/opt/bitnami/licenses" -curl --silent -L "https://raw.githubusercontent.com/tianon/gosu/master/LICENSE" > "/opt/bitnami/licenses/gosu-${VERSION}.txt" diff --git a/bitnami/discourse/2/debian-10/prebuildfs/build/install-tini.sh b/bitnami/discourse/2/debian-10/prebuildfs/build/install-tini.sh deleted file mode 100755 index 8376a36aee5f..000000000000 --- a/bitnami/discourse/2/debian-10/prebuildfs/build/install-tini.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -GPG_KEY="595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7" -GPG_KEY_FINGERPRINT="6380 DC42 8747 F6C3 93FE ACA5 9A84 159D 7001 A4E5" -SERVERS=("ha.pool.sks-keyservers.net" "hkp://p80.pool.sks-keyservers.net:80" "keyserver.ubuntu.com" "hkp://keyserver.ubuntu.com:80" "pgp.mit.edu") -VERSION="0.13.2" - -for server in "${SERVERS[@]}"; do - gpg --keyserver "$server" --recv-keys "$GPG_KEY" && break || : -done -gpg --fingerprint "$GPG_KEY" | grep -q "$GPG_KEY_FINGERPRINT" -curl --silent -L "https://github.com/krallin/tini/releases/download/v${VERSION}/tini.asc" > "/tmp/tini.asc" -curl --silent -L "https://github.com/krallin/tini/releases/download/v${VERSION}/tini" > "/usr/local/bin/tini" -gpg --verify "/tmp/tini.asc" "/usr/local/bin/tini" -chmod +x "/usr/local/bin/tini" -mkdir -p "/opt/bitnami/licenses" -curl --silent -L "https://raw.githubusercontent.com/krallin/tini/master/LICENSE" > "/opt/bitnami/licenses/tini-${VERSION}.txt" diff --git a/bitnami/discourse/2/debian-10/rootfs/licenses/licenses.txt b/bitnami/discourse/2/debian-10/rootfs/opt/bitnami/licenses/licenses.txt similarity index 100% rename from bitnami/discourse/2/debian-10/rootfs/licenses/licenses.txt rename to bitnami/discourse/2/debian-10/rootfs/opt/bitnami/licenses/licenses.txt diff --git a/bitnami/discourse/README.md b/bitnami/discourse/README.md index 01fb7e095627..b518c9ce07ff 100644 --- a/bitnami/discourse/README.md +++ b/bitnami/discourse/README.md @@ -47,7 +47,7 @@ $ kubectl apply -f test.yaml Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/). -* [`2-debian-10`, `2.4.1-debian-10-r4`, `2`, `2.4.1`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-discourse/blob/2.4.1-debian-10-r4/2/debian-10/Dockerfile) +* [`2-debian-10`, `2.4.1-debian-10-r5`, `2`, `2.4.1`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-discourse/blob/2.4.1-debian-10-r5/2/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/discourse GitHub repo](https://github.com/bitnami/bitnami-docker-discourse).