diff --git a/bitnami/postgresql/12/debian-10/Dockerfile b/bitnami/postgresql/12/debian-10/Dockerfile index f109ca7de19b..6d2a51ba851c 100644 --- a/bitnami/postgresql/12/debian-10/Dockerfile +++ b/bitnami/postgresql/12/debian-10/Dockerfile @@ -1,31 +1,29 @@ FROM docker.io/bitnami/minideb:buster LABEL maintainer "Bitnami " -ENV BITNAMI_PKG_CHMOD="-R g+rwX" \ - HOME="/" \ +ENV HOME="/" \ OS_ARCH="amd64" \ OS_FLAVOUR="debian-10" \ OS_NAME="linux" COPY prebuildfs / # Install required system packages and dependencies -RUN install_packages ca-certificates curl libbsd0 libc6 libedit2 libffi6 libgcc1 libgmp10 libgnutls30 libhogweed4 libicu63 libidn2-0 libldap-2.4-2 liblzma5 libnettle6 libp11-kit0 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 locales procps sudo unzip zlib1g +RUN install_packages ca-certificates curl gzip libbsd0 libc6 libedit2 libffi6 libgcc1 libgmp10 libgnutls30 libhogweed4 libicu63 libidn2-0 libldap-2.4-2 liblzma5 libnettle6 libp11-kit0 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 locales procps tar zlib1g RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "postgresql" "12.2.0-4" --checksum 65a8d75d237413aff181982f9e704addb84544cbe6d19b12e85066581d24f4f9 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-0" --checksum 582d501eeb6b338a24f417fededbf14295903d6be55c52d66c52e616c81bcd8c RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives +RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8 RUN update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX && \ DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales -RUN echo 'en_GB.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen COPY rootfs / RUN /opt/bitnami/scripts/postgresql/postunpack.sh ENV BITNAMI_APP_NAME="postgresql" \ - BITNAMI_IMAGE_VERSION="12.2.0-debian-10-r90" \ + BITNAMI_IMAGE_VERSION="12.2.0-debian-10-r91" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ - NAMI_PREFIX="/.nami" \ NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \ PATH="/opt/bitnami/postgresql/bin:/opt/bitnami/common/bin:$PATH" diff --git a/bitnami/postgresql/12/debian-10/docker-compose.yml b/bitnami/postgresql/12/debian-10/docker-compose.yml index 6a63c71c26ab..46afb014dc5a 100644 --- a/bitnami/postgresql/12/debian-10/docker-compose.yml +++ b/bitnami/postgresql/12/debian-10/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: postgresql: - image: 'bitnami/postgresql:12' + image: 'docker.io/bitnami/postgresql:12-debian-10' ports: - '5432:5432' volumes: diff --git a/bitnami/postgresql/12/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/postgresql/12/debian-10/prebuildfs/usr/sbin/install_packages new file mode 100755 index 000000000000..c9577647443b --- /dev/null +++ b/bitnami/postgresql/12/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/postgresql/README.md b/bitnami/postgresql/README.md index 061b24a8f93e..ddec5ce599f0 100644 --- a/bitnami/postgresql/README.md +++ b/bitnami/postgresql/README.md @@ -42,8 +42,8 @@ Non-root container images add an extra layer of security and are generally recom 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/). -* [`12-debian-10`, `12.2.0-debian-10-r90`, `12`, `12.2.0` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.2.0-debian-10-r90/12/debian-10/Dockerfile) -* [`11-debian-10`, `11.7.0-debian-10-r94`, `11`, `11.7.0`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.7.0-debian-10-r94/11/debian-10/Dockerfile) +* [`12-debian-10`, `12.2.0-debian-10-r91`, `12`, `12.2.0`, `latest` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.2.0-debian-10-r91/12/debian-10/Dockerfile) +* [`11-debian-10`, `11.7.0-debian-10-r94`, `11`, `11.7.0` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.7.0-debian-10-r94/11/debian-10/Dockerfile) * [`10-debian-10`, `10.12.0-debian-10-r91`, `10`, `10.12.0` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.12.0-debian-10-r91/10/debian-10/Dockerfile) * [`9.6-debian-10`, `9.6.17-debian-10-r91`, `9.6`, `9.6.17` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.17-debian-10-r91/9.6/debian-10/Dockerfile) @@ -67,7 +67,7 @@ $ docker pull bitnami/postgresql:[TAG] If you wish, you can also build the image yourself. ```console -$ docker build -t bitnami/postgresql:latest 'https://github.com/bitnami/bitnami-docker-postgresql.git#master:11/debian-10' +$ docker build -t bitnami/postgresql:latest 'https://github.com/bitnami/bitnami-docker-postgresql.git#master:12/debian-10' ``` # Persisting your database diff --git a/bitnami/postgresql/docker-compose-replication.yml b/bitnami/postgresql/docker-compose-replication.yml index 58b3086aa63c..9b08db021148 100644 --- a/bitnami/postgresql/docker-compose-replication.yml +++ b/bitnami/postgresql/docker-compose-replication.yml @@ -2,7 +2,7 @@ version: '2' services: postgresql-master: - image: 'bitnami/postgresql:12' + image: 'docker.io/bitnami/postgresql:12-debian-10' ports: - '5432' volumes: @@ -16,7 +16,7 @@ services: - POSTGRESQL_DATABASE=my_database - ALLOW_EMPTY_PASSWORD=yes postgresql-slave: - image: 'bitnami/postgresql:12' + image: 'docker.io/bitnami/postgresql:12-debian-10' ports: - '5432' depends_on: diff --git a/bitnami/postgresql/docker-compose.yml b/bitnami/postgresql/docker-compose.yml index 32cd8df6a8ff..46afb014dc5a 100644 --- a/bitnami/postgresql/docker-compose.yml +++ b/bitnami/postgresql/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: postgresql: - image: 'bitnami/postgresql:11' + image: 'docker.io/bitnami/postgresql:12-debian-10' ports: - '5432:5432' volumes: