From 17bd37b7d3b60886fc66dd0c1f88463288e0bd9d Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Mon, 21 Jan 2019 11:51:01 +0000 Subject: [PATCH] 9.6.11-ol-7-r83 release --- bitnami/postgresql/9.6/ol-7/Dockerfile | 7 +++-- .../9.6/ol-7/rootfs/app-entrypoint.sh | 26 +++++++++++++++++++ .../9.6/ol-7/rootfs/postgresql-inputs.json | 3 +++ bitnami/postgresql/README.md | 2 +- 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/bitnami/postgresql/9.6/ol-7/Dockerfile b/bitnami/postgresql/9.6/ol-7/Dockerfile index 6292a0a29b87..1ac14716df76 100644 --- a/bitnami/postgresql/9.6/ol-7/Dockerfile +++ b/bitnami/postgresql/9.6/ol-7/Dockerfile @@ -6,18 +6,21 @@ ENV BITNAMI_PKG_CHMOD="-R g+rwX" \ # Install required system packages and dependencies RUN install_packages glibc keyutils-libs krb5-libs libcom_err libselinux libxml2 libxslt ncurses-libs nss-softokn-freebl openssl-libs pcre readline xz-libs zlib -RUN bitnami-pkg unpack postgresql-9.6.11-28 --checksum 0591dffb74488cf76c346e5b8885e39e3c44c8241e65ac51a7de933330631a7e +RUN bitnami-pkg unpack postgresql-9.6.11-29 --checksum cb6524d3f42ec350c5fd4257499020da19cb8a6ed290e3186e9792920cb14e66 RUN mkdir /docker-entrypoint-initdb.d /opt/bitnami/postgresql/conf/ RUN chmod -R g+rwX /opt/bitnami/postgresql/conf/ COPY rootfs / RUN rpm -Uvh --nodeps $(repoquery --location nss_wrapper) ENV BITNAMI_APP_NAME="postgresql" \ - BITNAMI_IMAGE_VERSION="9.6.11-ol-7-r82" \ + BITNAMI_IMAGE_VERSION="9.6.11-ol-7-r83" \ NAMI_PREFIX="/.nami" \ PATH="/opt/bitnami/postgresql/bin:$PATH" \ POSTGRESQL_CLUSTER_APP_NAME="walreceiver" \ POSTGRESQL_DATABASE="" \ + POSTGRESQL_DATA_DIR="/bitnami/postgresql" \ + POSTGRESQL_INITDB_ARGS="" \ + POSTGRESQL_INITDB_WALDIR="" \ POSTGRESQL_MASTER_HOST="" \ POSTGRESQL_MASTER_PORT_NUMBER="5432" \ POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS="0" \ diff --git a/bitnami/postgresql/9.6/ol-7/rootfs/app-entrypoint.sh b/bitnami/postgresql/9.6/ol-7/rootfs/app-entrypoint.sh index 055793929f20..3daff929fa7c 100755 --- a/bitnami/postgresql/9.6/ol-7/rootfs/app-entrypoint.sh +++ b/bitnami/postgresql/9.6/ol-7/rootfs/app-entrypoint.sh @@ -36,6 +36,32 @@ if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/run.sh" ]]; then export POSTGRESQL_REPLICATION_PASSWORD=$REPLICATION_PASSWORD_AUX fi + declareEnvironmentVariableAlias() { + if env | grep -q "$2"; then + export $1=${!2} + fi + } + + # Alias created for official postgre image compatibility + declareEnvironmentVariableAlias POSTGRESQL_PASSWORD POSTGRES_PASSWORD + declareEnvironmentVariableAlias POSTGRESQL_DATABASE POSTGRES_DB + declareEnvironmentVariableAlias POSTGRESQL_USERNAME POSTGRES_USER + declareEnvironmentVariableAlias POSTGRESQL_DATA_DIR PGDATA + declareEnvironmentVariableAlias POSTGRESQL_INITDB_WALDIR POSTGRES_INITDB_WALDIR + + # Alias created for maintain consistency using prefix + declareEnvironmentVariableAlias POSTGRESQL_CLUSTER_APP_NAME POSTGRES_CLUSTER_APP_NAME + declareEnvironmentVariableAlias POSTGRESQL_MASTER_HOST POSTGRES_MASTER_HOST + declareEnvironmentVariableAlias POSTGRESQL_MASTER_PORT_NUMBER POSTGRES_MASTER_PORT_NUMBER + declareEnvironmentVariableAlias POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS POSTGRES_NUM_SYNCHRONOUS_REPLICAS + declareEnvironmentVariableAlias POSTGRESQL_PORT_NUMBER POSTGRES_PORT_NUMBER + declareEnvironmentVariableAlias POSTGRESQL_REPLICATION_MODE POSTGRES_REPLICATION_MODE + declareEnvironmentVariableAlias POSTGRESQL_REPLICATION_PASSWORD POSTGRES_REPLICATION_PASSWORD + declareEnvironmentVariableAlias POSTGRESQL_REPLICATION_USER POSTGRES_REPLICATION_USER + declareEnvironmentVariableAlias POSTGRESQL_SYNCHRONOUS_COMMIT_MODE POSTGRES_SYNCHRONOUS_COMMIT_MODE + declareEnvironmentVariableAlias POSTGRESQL_PASSWORD_FILE POSTGRES_PASSWORD_FILE + declareEnvironmentVariableAlias POSTGRESQL_REPLICATION_PASSWORD_FILE POSTGRES_REPLICATION_PASSWORD_FILE + nami_initialize postgresql info "Starting postgresql... " fi diff --git a/bitnami/postgresql/9.6/ol-7/rootfs/postgresql-inputs.json b/bitnami/postgresql/9.6/ol-7/rootfs/postgresql-inputs.json index 40f6732a3df3..d878f31c82f7 100644 --- a/bitnami/postgresql/9.6/ol-7/rootfs/postgresql-inputs.json +++ b/bitnami/postgresql/9.6/ol-7/rootfs/postgresql-inputs.json @@ -1,10 +1,13 @@ { "clusterAppName": "{{$global.env.POSTGRESQL_CLUSTER_APP_NAME}}", "database": "{{$global.env.POSTGRESQL_DATABASE}}", + "initdbArgs": "{{$global.env.POSTGRESQL_INITDB_ARGS}}", + "initdbWalDir": "{{$global.env.POSTGRESQL_INITDB_WALDIR}}", "masterHost": "{{$global.env.POSTGRESQL_MASTER_HOST}}", "masterPort": "{{$global.env.POSTGRESQL_MASTER_PORT_NUMBER}}", "numSynchronousReplicas": "{{$global.env.POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS}}", "password": "{{$global.env.POSTGRESQL_PASSWORD}}", + "persistDir": "{{$global.env.POSTGRESQL_DATA_DIR}}", "postgresqlPort": "{{$global.env.POSTGRESQL_PORT_NUMBER}}", "replicationMode": "{{$global.env.POSTGRESQL_REPLICATION_MODE}}", "replicationPassword": "{{$global.env.POSTGRESQL_REPLICATION_PASSWORD}}", diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md index 7ae8ed9b0fe9..daa595fca924 100644 --- a/bitnami/postgresql/README.md +++ b/bitnami/postgresql/README.md @@ -47,7 +47,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`11-debian-9`, `11.1.0-debian-9-r61`, `11`, `11.1.0`, `11.1.0-r61` (11/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.1.0-debian-9-r61/11/debian-9/Dockerfile) * [`10-ol-7`, `10.6.0-ol-7-r83` (10/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.6.0-ol-7-r83/10/ol-7/Dockerfile) * [`10-debian-9`, `10.6.0-debian-9-r67`, `10`, `10.6.0`, `10.6.0-r67`, `latest` (10/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.6.0-debian-9-r67/10/debian-9/Dockerfile) -* [`9.6-ol-7`, `9.6.11-ol-7-r82` (9.6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.11-ol-7-r82/9.6/ol-7/Dockerfile) +* [`9.6-ol-7`, `9.6.11-ol-7-r83` (9.6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.11-ol-7-r83/9.6/ol-7/Dockerfile) * [`9.6-debian-9`, `9.6.11-debian-9-r65`, `9.6`, `9.6.11`, `9.6.11-r65` (9.6/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.11-debian-9-r65/9.6/debian-9/Dockerfile) Subscribe to project updates by watching the [bitnami/postgresql GitHub repo](https://github.com/bitnami/bitnami-docker-postgresql).