4.1.2-debian-10-r1 release

2020-05-22 04:24:19 +00:00 · 2020-05-22 04:24:19 +00:00 · 929ba081f4
parent f538977c82
commit 929ba081f4
6 changed files with 47 additions and 18 deletions
--- a/bitnami/pgpool/4/debian-10/Dockerfile
+++ b/bitnami/pgpool/4/debian-10/Dockerfile
@ -1,17 +1,16 @@
 FROM docker.io/bitnami/minideb:buster
 LABEL maintainer "Bitnami <containers@bitnami.com>"

-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 ldap-utils libaudit1 libbsd0 libc6 libcap-ng0 libedit2 libffi6 libgcc1 libgmp10 libgnutls30 libhogweed4 libicu63 libidn2-0 libldap-2.4-2 liblzma5 libnettle6 libnss-ldapd libp11-kit0 libpam-ldapd libpam0g libsasl2-2 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 nslcd procps sudo unzip zlib1g
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wait-for-port" "1.0.0-1" --checksum 07c4678654b01811f22b5bb65a8d6f8e253abd4524ebb3b78c7d3df042cf23bd
+RUN install_packages ca-certificates curl gzip ldap-utils libaudit1 libbsd0 libc6 libcap-ng0 libedit2 libffi6 libgcc1 libgmp10 libgnutls30 libhogweed4 libicu63 libidn2-0 libldap-2.4-2 liblzma5 libnettle6 libnss-ldapd libp11-kit0 libpam-ldapd libpam0g libsasl2-2 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 nslcd procps tar zlib1g
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "postgresql-client" "10.13.0-0" --checksum 30ab4540dddd0c7a6aabb92c5fda4b6746427cd71d9b44964d0a02c7409fac2f
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wait-for-port" "1.0.0-1" --checksum 07c4678654b01811f22b5bb65a8d6f8e253abd4524ebb3b78c7d3df042cf23bd
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "pgpool" "4.1.2-0" --checksum 3c4c054688bf305a2401b929efa627dcd9862bb7ab0b96ce935d4f4bce52ffd5
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-0" --checksum 582d501eeb6b338a24f417fededbf14295903d6be55c52d66c52e616c81bcd8c
 RUN apt-get update && apt-get upgrade -y && \
@ -20,9 +19,15 @@ RUN apt-get update && apt-get upgrade -y && \
 COPY rootfs /
 RUN /opt/bitnami/scripts/pgpool/postunpack.sh
 ENV BITNAMI_APP_NAME="pgpool" \
-    BITNAMI_IMAGE_VERSION="4.1.2-debian-10-r0" \
-    NAMI_PREFIX="/.nami" \
-    PATH="/opt/bitnami/common/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/pgpool/bin:$PATH"
+    BITNAMI_IMAGE_VERSION="4.1.2-debian-10-r1" \
+    PATH="/opt/bitnami/postgresql/bin:/opt/bitnami/common/bin:/opt/bitnami/pgpool/bin:$PATH" \
+    POSTGRESQL_CLIENT_CREATE_DATABASE_NAME="" \
+    POSTGRESQL_CLIENT_CREATE_DATABASE_PASSWORD="" \
+    POSTGRESQL_CLIENT_CREATE_DATABASE_USERNAME="" \
+    POSTGRESQL_HOST="postgresql" \
+    POSTGRESQL_PORT_NUMBER="5432" \
+    POSTGRESQL_ROOT_PASSWORD="" \
+    POSTGRESQL_ROOT_USER="postgres"

 EXPOSE 5432

--- a/bitnami/pgpool/4/debian-10/docker-compose.yml
+++ b/bitnami/pgpool/4/debian-10/docker-compose.yml
@ -1,7 +1,7 @@
 version: '2.1'
 services:
  pg-0:
-    image: bitnami/postgresql-repmgr:11
+    image: docker.io/bitnami/postgresql-repmgr:11-debian-10
    ports:
      - 5432
    volumes:
@ -17,7 +17,7 @@ services:
      - REPMGR_NODE_NAME=pg-0
      - REPMGR_NODE_NETWORK_NAME=pg-0
  pg-1:
-    image: bitnami/postgresql-repmgr:11
+    image: docker.io/bitnami/postgresql-repmgr:11-debian-10
    ports:
      - 5432
    volumes:
@ -33,7 +33,7 @@ services:
      - REPMGR_NODE_NAME=pg-1
      - REPMGR_NODE_NETWORK_NAME=pg-1
  pgpool:
-    image: bitnami/pgpool:4
+    image: docker.io/bitnami/pgpool:4-debian-10
    ports:
      - 5432:5432
    environment:
--- a/bitnami/pgpool/4/debian-10/prebuildfs/usr/sbin/install_packages
+++ b/bitnami/pgpool/4/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
--- a/bitnami/pgpool/README.md
+++ b/bitnami/pgpool/README.md
@ -37,7 +37,7 @@ 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/).


-* [`4-debian-10`, `4.1.2-debian-10-r0`, `4`, `4.1.2`, `latest` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-pgpool/blob/4.1.2-debian-10-r0/4/debian-10/Dockerfile)
+* [`4-debian-10`, `4.1.2-debian-10-r1`, `4`, `4.1.2`, `latest` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-pgpool/blob/4.1.2-debian-10-r1/4/debian-10/Dockerfile)

 Subscribe to project updates by watching the [bitnami/pgpool GitHub repo](https://github.com/bitnami/bitnami-docker-pgpool).

--- a/bitnami/pgpool/docker-compose-ldap.yml
+++ b/bitnami/pgpool/docker-compose-ldap.yml
@ -1,7 +1,7 @@
 version: '2.1'
 services:
  pg-0:
-    image: bitnami/postgresql-repmgr:11
+    image: docker.io/bitnami/postgresql-repmgr:11-debian-10
    ports:
      - 5432
    volumes:
@ -18,7 +18,7 @@ services:
      - REPMGR_NODE_NETWORK_NAME=pg-0
      - REPMGR_PGHBA_TRUST_ALL=yes
  pg-1:
-    image: bitnami/postgresql-repmgr:11
+    image: docker.io/bitnami/postgresql-repmgr:11-debian-10
    ports:
      - 5432
    volumes:
@ -35,7 +35,7 @@ services:
      - REPMGR_NODE_NETWORK_NAME=pg-1
      - REPMGR_PGHBA_TRUST_ALL=yes
  pgpool:
-    image: bitnami/pgpool:4
+    image: docker.io/bitnami/pgpool:4-debian-10
    ports:
      - 5432:5432
    environment:
@ -58,7 +58,7 @@ services:
      timeout: 5s
      retries: 5
  openldap:
-    image: 'bitnami/openldap:latest'
+    image: 'docker.io/bitnami/openldap:latest'
    ports:
      - '1389:1389'
    environment:
--- a/bitnami/pgpool/docker-compose.yml
+++ b/bitnami/pgpool/docker-compose.yml
@ -1,7 +1,7 @@
 version: '2.1'
 services:
  pg-0:
-    image: bitnami/postgresql-repmgr:11
+    image: docker.io/bitnami/postgresql-repmgr:11-debian-10
    ports:
      - 5432
    volumes:
@ -17,7 +17,7 @@ services:
      - REPMGR_NODE_NAME=pg-0
      - REPMGR_NODE_NETWORK_NAME=pg-0
  pg-1:
-    image: bitnami/postgresql-repmgr:11
+    image: docker.io/bitnami/postgresql-repmgr:11-debian-10
    ports:
      - 5432
    volumes:
@ -33,7 +33,7 @@ services:
      - REPMGR_NODE_NAME=pg-1
      - REPMGR_NODE_NETWORK_NAME=pg-1
  pgpool:
-    image: bitnami/pgpool:4
+    image: docker.io/bitnami/pgpool:4-debian-10
    ports:
      - 5432:5432
    environment: