From 74b44ec89ac1555a304f682ca2286d5809726d7d Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 20 May 2020 02:09:31 +0000 Subject: [PATCH] 2.4.3-debian-10-r15 release --- bitnami/discourse/2/debian-10/Dockerfile | 7 ++++-- .../discourse/2/debian-10/docker-compose.yml | 8 +++---- .../prebuildfs/usr/sbin/install_packages | 24 +++++++++++++++++++ bitnami/discourse/2/debian-10/rootfs/init.sh | 0 bitnami/discourse/README.md | 2 +- bitnami/discourse/docker-compose.yml | 8 +++---- 6 files changed, 38 insertions(+), 11 deletions(-) create mode 100755 bitnami/discourse/2/debian-10/prebuildfs/usr/sbin/install_packages mode change 100644 => 100755 bitnami/discourse/2/debian-10/rootfs/init.sh diff --git a/bitnami/discourse/2/debian-10/Dockerfile b/bitnami/discourse/2/debian-10/Dockerfile index f86c51b7031e..af42c348dbec 100644 --- a/bitnami/discourse/2/debian-10/Dockerfile +++ b/bitnami/discourse/2/debian-10/Dockerfile @@ -5,7 +5,7 @@ ENV PATH="/opt/bitnami/ruby/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/git/bin COPY prebuildfs / # Install required system packages and dependencies -RUN install_packages advancecomp ca-certificates curl dirmngr file ghostscript gifsicle gnupg hostname imagemagick jhead jpegoptim libbsd0 libc6 libcom-err2 libcurl4 libedit2 libffi6 libgcc1 libgcrypt20 libgmp-dev libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu63 libidn2-0 libjpeg-progs libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libncurses6 libnettle6 libnghttp2-14 libp11-kit0 libpq5 libpsl5 libreadline7 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxml2-dev libxslt1-dev libxslt1.1 optipng pngcrush pngquant procps rsync sudo unzip zlib1g zlib1g-dev +RUN install_packages advancecomp ca-certificates curl dirmngr file ghostscript gifsicle gnupg gzip hostname imagemagick jhead jpegoptim libbsd0 libc6 libcom-err2 libcurl4 libedit2 libffi6 libgcc1 libgcrypt20 libgmp-dev libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu63 libidn2-0 libjpeg-progs libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libncurses6 libnettle6 libnghttp2-14 libp11-kit0 libpq5 libpsl5 libreadline7 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxml2-dev libxslt1-dev libxslt1.1 optipng pngcrush pngquant procps rsync sudo tar zlib1g zlib1g-dev RUN /build/bitnami-user.sh RUN /build/install-nami.sh RUN bitnami-pkg install ruby-2.6.6-0 --checksum ecadce77e40822926c69f76cc11437954dd068793548c3f0a21007f9c4fafed3 @@ -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.3-debian-10-r14" \ + BITNAMI_IMAGE_VERSION="2.4.3-debian-10-r15" \ DISCOURSE_EMAIL="user@example.com" \ DISCOURSE_HOST="discourse" \ DISCOURSE_HOSTNAME="127.0.0.1" \ @@ -36,6 +36,9 @@ ENV BITNAMI_APP_NAME="discourse" \ DISCOURSE_SITENAME="My site!" \ DISCOURSE_SKIP_INSTALL="no" \ DISCOURSE_USERNAME="user" \ + OS_ARCH="amd64" \ + OS_FLAVOUR="debian-10" \ + OS_NAME="linux" \ POSTGRESQL_CLIENT_CREATE_DATABASE_NAME="" \ POSTGRESQL_CLIENT_CREATE_DATABASE_PASSWORD="" \ POSTGRESQL_CLIENT_CREATE_DATABASE_USERNAME="" \ diff --git a/bitnami/discourse/2/debian-10/docker-compose.yml b/bitnami/discourse/2/debian-10/docker-compose.yml index 1acf76d18562..82b3b28b9918 100644 --- a/bitnami/discourse/2/debian-10/docker-compose.yml +++ b/bitnami/discourse/2/debian-10/docker-compose.yml @@ -1,19 +1,19 @@ version: '2' services: postgresql: - image: 'bitnami/postgresql:11' + image: 'docker.io/bitnami/postgresql:11-debian-10' environment: - ALLOW_EMPTY_PASSWORD=yes volumes: - 'postgresql_data:/bitnami/postgresql' redis: - image: 'bitnami/redis:5.0' + image: 'docker.io/bitnami/redis:5.0-debian-10' environment: - ALLOW_EMPTY_PASSWORD=yes volumes: - 'redis_data:/bitnami' discourse: - image: 'bitnami/discourse:2' + image: 'docker.io/bitnami/discourse:2-debian-10' ports: - '80:3000' depends_on: @@ -32,7 +32,7 @@ services: - DISCOURSE_POSTGRESQL_PASSWORD=bitnami1 - DISCOURSE_HOSTNAME=www.example.com sidekiq: - image: 'bitnami/discourse:2' + image: 'docker.io/bitnami/discourse:2-debian-10' depends_on: - discourse volumes: diff --git a/bitnami/discourse/2/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/discourse/2/debian-10/prebuildfs/usr/sbin/install_packages new file mode 100755 index 000000000000..c9577647443b --- /dev/null +++ b/bitnami/discourse/2/debian-10/prebuildfs/usr/sbin/install_packages @@ -0,0 +1,24 @@ +#!/bin/sh +set -e +set -u +export DEBIAN_FRONTEND=noninteractive +n=0 +max=2 +until [ $n -gt $max ]; do + set +e + ( + apt-get update -qq && + apt-get install -y --no-install-recommends "$@" + ) + CODE=$? + set -e + if [ $CODE -eq 0 ]; then + break + fi + if [ $n -eq $max ]; then + exit $CODE + fi + echo "apt failed, retrying" + n=$(($n + 1)) +done +rm -r /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/discourse/2/debian-10/rootfs/init.sh b/bitnami/discourse/2/debian-10/rootfs/init.sh old mode 100644 new mode 100755 diff --git a/bitnami/discourse/README.md b/bitnami/discourse/README.md index a6bb451dd035..7267c97de548 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-debian-10`, `2.4.3-debian-10-r14`, `2`, `2.4.3`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-discourse/blob/2.4.3-debian-10-r14/2/debian-10/Dockerfile) +* [`2-debian-10`, `2.4.3-debian-10-r15`, `2`, `2.4.3`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-discourse/blob/2.4.3-debian-10-r15/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 1acf76d18562..82b3b28b9918 100644 --- a/bitnami/discourse/docker-compose.yml +++ b/bitnami/discourse/docker-compose.yml @@ -1,19 +1,19 @@ version: '2' services: postgresql: - image: 'bitnami/postgresql:11' + image: 'docker.io/bitnami/postgresql:11-debian-10' environment: - ALLOW_EMPTY_PASSWORD=yes volumes: - 'postgresql_data:/bitnami/postgresql' redis: - image: 'bitnami/redis:5.0' + image: 'docker.io/bitnami/redis:5.0-debian-10' environment: - ALLOW_EMPTY_PASSWORD=yes volumes: - 'redis_data:/bitnami' discourse: - image: 'bitnami/discourse:2' + image: 'docker.io/bitnami/discourse:2-debian-10' ports: - '80:3000' depends_on: @@ -32,7 +32,7 @@ services: - DISCOURSE_POSTGRESQL_PASSWORD=bitnami1 - DISCOURSE_HOSTNAME=www.example.com sidekiq: - image: 'bitnami/discourse:2' + image: 'docker.io/bitnami/discourse:2-debian-10' depends_on: - discourse volumes: