From 72073e7f890ed7f5a5d57ac2ab3cf131340f9f5a Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 19 May 2020 16:17:54 +0000 Subject: [PATCH] 3.16.0-debian-10-r1 release --- bitnami/ghost/3/debian-10/Dockerfile | 13 ++++++---- bitnami/ghost/3/debian-10/docker-compose.yml | 4 ++-- .../prebuildfs/usr/sbin/install_packages | 24 +++++++++++++++++++ bitnami/ghost/3/debian-10/rootfs/init.sh | 0 bitnami/ghost/README.md | 2 +- bitnami/ghost/docker-compose.yml | 4 ++-- 6 files changed, 37 insertions(+), 10 deletions(-) create mode 100755 bitnami/ghost/3/debian-10/prebuildfs/usr/sbin/install_packages mode change 100644 => 100755 bitnami/ghost/3/debian-10/rootfs/init.sh diff --git a/bitnami/ghost/3/debian-10/Dockerfile b/bitnami/ghost/3/debian-10/Dockerfile index 843213f49d62..27a06c805d64 100644 --- a/bitnami/ghost/3/debian-10/Dockerfile +++ b/bitnami/ghost/3/debian-10/Dockerfile @@ -4,16 +4,16 @@ LABEL maintainer "Bitnami " ENV BITNAMI_PKG_CHMOD="-R g+rwX,o+rw" \ BITNAMI_PKG_EXTRA_DIRS="/.ghost /opt/bitnami/content" \ HOME="/" \ - PATH="/opt/bitnami/common/bin:/opt/bitnami/node/bin:/opt/bitnami/mysql/bin:/opt/bitnami/ghost/bin:/opt/bitnami/nami/bin:$PATH" + PATH="/opt/bitnami/node/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:/opt/bitnami/ghost/bin:/opt/bitnami/nami/bin:$PATH" COPY prebuildfs / # Install required system packages and dependencies -RUN install_packages ca-certificates curl dirmngr ghostscript gnupg imagemagick libaudit1 libbsd0 libbz2-1.0 libc6 libcap-ng0 libffi6 libgcc1 libicu63 libjemalloc2 liblzma5 libncurses6 libncursesw6 libpam0g libreadline7 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libx11-6 libxau6 libxcb1 libxdmcp6 libxml2 procps sudo unzip zlib1g +RUN install_packages ca-certificates curl dirmngr ghostscript gnupg gzip imagemagick libaudit1 libbsd0 libbz2-1.0 libc6 libcap-ng0 libffi6 libgcc1 libicu63 libjemalloc2 liblzma5 libncurses6 libncursesw6 libpam0g libreadline7 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libx11-6 libxau6 libxcb1 libxdmcp6 libxml2 procps sudo tar zlib1g RUN /build/bitnami-user.sh RUN /build/install-nami.sh -RUN bitnami-pkg install tini-0.19.0-0 --checksum 9a8ae20be31a518f042fcec359f2cf35bfdb4e2a56f2fa8ff9ef2ecaf45da80c -RUN bitnami-pkg install node-10.20.1-4 --checksum b52baa39794d0e0b8b13d72fd075d71a2ceb3445e363b1d4f3a4a78bb2c69859 +RUN bitnami-pkg install node-10.20.1-5 --checksum 0729ab9dcf6c86f78b18c5e562e3e504fda5dc25e9fdcd8d192106e805142f7a RUN bitnami-pkg unpack mysql-client-10.3.23-0 --checksum 7af3cead7a38670bed924fbc99e20c67f6244bb5a92642adb4ab6cd307aa9a5e +RUN bitnami-pkg install tini-0.19.0-0 --checksum 9a8ae20be31a518f042fcec359f2cf35bfdb4e2a56f2fa8ff9ef2ecaf45da80c RUN bitnami-pkg install gosu-1.12.0-0 --checksum 582d501eeb6b338a24f417fededbf14295903d6be55c52d66c52e616c81bcd8c RUN bitnami-pkg unpack ghost-3.16.0-0 --checksum bc5d7c1c60cf6db75cf5e38cffb14c6134799f012e05bd479950ea3d5fc9a432 RUN apt-get update && apt-get upgrade -y && \ @@ -22,7 +22,7 @@ RUN apt-get update && apt-get upgrade -y && \ COPY rootfs / ENV ALLOW_EMPTY_PASSWORD="no" \ BITNAMI_APP_NAME="ghost" \ - BITNAMI_IMAGE_VERSION="3.16.0-debian-10-r0" \ + BITNAMI_IMAGE_VERSION="3.16.0-debian-10-r1" \ BLOG_TITLE="User's Blog" \ GHOST_DATABASE_NAME="bitnami_ghost" \ GHOST_DATABASE_PASSWORD="" \ @@ -44,6 +44,9 @@ ENV ALLOW_EMPTY_PASSWORD="no" \ MYSQL_CLIENT_ENABLE_SSL="no" \ MYSQL_CLIENT_SSL_CA_FILE="" \ NAMI_PREFIX="/.nami" \ + OS_ARCH="amd64" \ + OS_FLAVOUR="debian-10" \ + OS_NAME="linux" \ SMTP_FROM_ADDRESS="" \ SMTP_HOST="" \ SMTP_PASSWORD="" \ diff --git a/bitnami/ghost/3/debian-10/docker-compose.yml b/bitnami/ghost/3/debian-10/docker-compose.yml index b7c0050d1bac..fa6ac406ec4a 100644 --- a/bitnami/ghost/3/debian-10/docker-compose.yml +++ b/bitnami/ghost/3/debian-10/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: mariadb: - image: 'bitnami/mariadb:10.3' + image: 'docker.io/bitnami/mariadb:10.3-debian-10' environment: - ALLOW_EMPTY_PASSWORD=yes - MARIADB_USER=bn_ghost @@ -9,7 +9,7 @@ services: volumes: - 'mariadb_data:/bitnami' ghost: - image: 'bitnami/ghost:3' + image: 'docker.io/bitnami/ghost:3-debian-10' environment: - MARIADB_HOST=mariadb - MARIADB_PORT_NUMBER=3306 diff --git a/bitnami/ghost/3/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/ghost/3/debian-10/prebuildfs/usr/sbin/install_packages new file mode 100755 index 000000000000..c9577647443b --- /dev/null +++ b/bitnami/ghost/3/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/ghost/3/debian-10/rootfs/init.sh b/bitnami/ghost/3/debian-10/rootfs/init.sh old mode 100644 new mode 100755 diff --git a/bitnami/ghost/README.md b/bitnami/ghost/README.md index c9e16e527429..811232b99b46 100644 --- a/bitnami/ghost/README.md +++ b/bitnami/ghost/README.md @@ -40,7 +40,7 @@ To run this application you need Docker Engine 1.10.0. Docker Compose is recomen 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/). -* [`3-debian-10`, `3.16.0-debian-10-r0`, `3`, `3.16.0`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-ghost/blob/3.16.0-debian-10-r0/3/debian-10/Dockerfile) +* [`3-debian-10`, `3.16.0-debian-10-r1`, `3`, `3.16.0`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-ghost/blob/3.16.0-debian-10-r1/3/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/ghost GitHub repo](https://github.com/bitnami/bitnami-docker-ghost). diff --git a/bitnami/ghost/docker-compose.yml b/bitnami/ghost/docker-compose.yml index b7c0050d1bac..fa6ac406ec4a 100644 --- a/bitnami/ghost/docker-compose.yml +++ b/bitnami/ghost/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: mariadb: - image: 'bitnami/mariadb:10.3' + image: 'docker.io/bitnami/mariadb:10.3-debian-10' environment: - ALLOW_EMPTY_PASSWORD=yes - MARIADB_USER=bn_ghost @@ -9,7 +9,7 @@ services: volumes: - 'mariadb_data:/bitnami' ghost: - image: 'bitnami/ghost:3' + image: 'docker.io/bitnami/ghost:3-debian-10' environment: - MARIADB_HOST=mariadb - MARIADB_PORT_NUMBER=3306