10.10.0-centos-7-r36 release
This commit is contained in:
Bitnami Bot
parent
9ad6b97c8c
commit
30e007b6d7
|
|
@ -1,4 +1,4 @@
|
|||
FROM bitnami/centos-extras-base:7-r202
|
||||
FROM bitnami/centos-extras-base:7-r203
|
||||
LABEL maintainer "Bitnami <containers@bitnami.com>"
|
||||
|
||||
ENV BITNAMI_PKG_CHMOD="-R g+rwX" \
|
||||
|
|
@ -15,7 +15,7 @@ COPY rootfs /
|
|||
RUN yum --enablerepo base,updates,extras -y install epel-release && yum --enablerepo base,updates,extras -y update && yum --enablerepo base,updates -y install nss_wrapper
|
||||
RUN /postunpack.sh
|
||||
ENV BITNAMI_APP_NAME="postgresql-repmgr" \
|
||||
BITNAMI_IMAGE_VERSION="10.10.0-centos-7-r35" \
|
||||
BITNAMI_IMAGE_VERSION="10.10.0-centos-7-r36" \
|
||||
NAMI_PREFIX="/.nami" \
|
||||
NSS_WRAPPER_LIB="/usr/lib64/libnss_wrapper.so" \
|
||||
PATH="/opt/bitnami/postgresql-repmgr/bin:/opt/bitnami/repmgr/bin:/opt/bitnami/postgresql/bin:$PATH"
|
||||
|
|
|
|||
|
|
@ -142,6 +142,19 @@ export POSTGRESQL_REPLICATION_USER="${POSTGRESQL_REPLICATION_USER:-}"
|
|||
export POSTGRESQL_SYNCHRONOUS_COMMIT_MODE="${POSTGRESQL_SYNCHRONOUS_COMMIT_MODE:-on}"
|
||||
export POSTGRESQL_FSYNC="${POSTGRESQL_FSYNC:-on}"
|
||||
export POSTGRESQL_USERNAME="${POSTGRESQL_USERNAME:-postgres}"
|
||||
export POSTGRESQL_ENABLE_LDAP="${POSTGRESQL_ENABLE_LDAP:-no}"
|
||||
export POSTGRESQL_LDAP_URL="${POSTGRESQL_LDAP_URL:-}"
|
||||
export POSTGRESQL_LDAP_PREFIX="${POSTGRESQL_LDAP_PREFIX:-}"
|
||||
export POSTGRESQL_LDAP_SUFFIX="${POSTGRESQL_LDAP_SUFFIX:-}"
|
||||
export POSTGRESQL_LDAP_SERVER="${POSTGRESQL_LDAP_SERVER:-}"
|
||||
export POSTGRESQL_LDAP_PORT="${POSTGRESQL_LDAP_PORT:-}"
|
||||
export POSTGRESQL_LDAP_SCHEME="${POSTGRESQL_LDAP_SCHEME:-}"
|
||||
export POSTGRESQL_LDAP_TLS="${POSTGRESQL_LDAP_TLS:-}"
|
||||
export POSTGRESQL_LDAP_BASE_DN="${POSTGRESQL_LDAP_BASE_DN:-}"
|
||||
export POSTGRESQL_LDAP_BIND_DN="${POSTGRESQL_LDAP_BIND_DN:-}"
|
||||
export POSTGRESQL_LDAP_BIND_PASSWORD="${POSTGRESQL_LDAP_BIND_PASSWORD:-}"
|
||||
export POSTGRESQL_LDAP_SEARCH_ATTR="${POSTGRESQL_LDAP_SEARCH_ATTR:-}"
|
||||
export POSTGRESQL_LDAP_SEARCH_FILTER="${POSTGRESQL_LDAP_SEARCH_FILTER:-}"
|
||||
|
||||
# Internal
|
||||
export POSTGRESQL_FIRST_BOOT="yes"
|
||||
|
|
@ -266,6 +279,14 @@ postgresql_validate() {
|
|||
fi
|
||||
fi
|
||||
|
||||
if ! is_yes_no_value "$POSTGRESQL_ENABLE_LDAP"; then
|
||||
empty_password_error "The values allowed for POSTGRESQL_ENABLE_LDAP are: yes or no"
|
||||
fi
|
||||
|
||||
if is_boolean_yes "$POSTGRESQL_ENABLE_LDAP" && [[ -n "$POSTGRESQL_LDAP_URL" ]] && [[ -n "$POSTGRESQL_LDAP_SERVER" ]]; then
|
||||
empty_password_error "You can not set POSTGRESQL_LDAP_URL and POSTGRESQL_LDAP_SERVER at the same time. Check your LDAP configuration."
|
||||
fi
|
||||
|
||||
[[ "$error_code" -eq 0 ]] || exit "$error_code"
|
||||
}
|
||||
|
||||
|
|
@ -290,6 +311,62 @@ postgresql_create_config() {
|
|||
sed -i -E "/#include_dir/i include_dir = 'conf.d'" "$POSTGRESQL_CONF_FILE"
|
||||
}
|
||||
|
||||
########################
|
||||
# Create ldap auth configuration in pg_hba,
|
||||
# but keeps postgres user to authenticate locally
|
||||
# Globals:
|
||||
# POSTGRESQL_*
|
||||
# Arguments:
|
||||
# None
|
||||
# Returns:
|
||||
# None
|
||||
#########################
|
||||
postgresql_ldap_auth_configuration() {
|
||||
postgresql_info "Generating LDAP authentication configuration"
|
||||
local ldap_configuration=""
|
||||
|
||||
if [[ -n "$POSTGRESQL_LDAP_URL" ]]; then
|
||||
ldap_configuration="ldapurl=\"$POSTGRESQL_LDAP_URL\""
|
||||
else
|
||||
ldap_configuration="ldapserver=${POSTGRESQL_LDAP_SERVER}"
|
||||
|
||||
[[ -n "$POSTGRESQL_LDAP_PREFIX" ]] && ldap_configuration+=" ldapprefix=\"${POSTGRESQL_LDAP_PREFIX}\""
|
||||
[[ -n "$POSTGRESQL_LDAP_SUFFIX" ]] && ldap_configuration+=" ldapsuffix=\"${POSTGRESQL_LDAP_SUFFIX}\""
|
||||
[[ -n "$POSTGRESQL_LDAP_PORT" ]] && ldap_configuration+=" ldapport=${POSTGRESQL_LDAP_PORT}"
|
||||
[[ -n "$POSTGRESQL_LDAP_BASE_DN" ]] && ldap_configuration+=" ldapbasedn=\"${POSTGRESQL_LDAP_BASE_DN}\""
|
||||
[[ -n "$POSTGRESQL_LDAP_BIND_DN" ]] && ldap_configuration+=" ldapbinddn=\"${POSTGRESQL_LDAP_BIND_DN}\""
|
||||
[[ -n "$POSTGRESQL_LDAP_BIND_PASSWORD" ]] && ldap_configuration+=" ldapbindpasswd=${POSTGRESQL_LDAP_BIND_PASSWORD}"
|
||||
[[ -n "$POSTGRESQL_LDAP_SEARCH_ATTR" ]] && ldap_configuration+=" ldapsearchattribute=${POSTGRESQL_LDAP_SEARCH_ATTR}"
|
||||
[[ -n "$POSTGRESQL_LDAP_SEARCH_FILTER" ]] && ldap_configuration+=" ldapsearchfilter=\"${POSTGRESQL_LDAP_SEARCH_FILTER}\""
|
||||
[[ -n "$POSTGRESQL_LDAP_TLS" ]] && ldap_configuration+=" ldaptls=${POSTGRESQL_LDAP_TLS}"
|
||||
[[ -n "$POSTGRESQL_LDAP_SCHEME" ]] && ldap_configuration+=" ldapscheme=${POSTGRESQL_LDAP_SCHEME}"
|
||||
fi
|
||||
|
||||
cat << EOF > "$POSTGRESQL_PGHBA_FILE"
|
||||
host all postgres 0.0.0.0/0 trust
|
||||
host all postgres ::1/128 trust
|
||||
host all all 0.0.0.0/0 ldap $ldap_configuration
|
||||
host all all ::1/128 ldap $ldap_configuration
|
||||
EOF
|
||||
}
|
||||
|
||||
########################
|
||||
# Create local auth configuration in pg_hba
|
||||
# Globals:
|
||||
# POSTGRESQL_*
|
||||
# Arguments:
|
||||
# None
|
||||
# Returns:
|
||||
# None
|
||||
#########################
|
||||
postgresql_password_auth_configuration() {
|
||||
postgresql_info "Generating local authentication configuration"
|
||||
cat << EOF > "$POSTGRESQL_PGHBA_FILE"
|
||||
host all all 0.0.0.0/0 trust
|
||||
host all all ::1/128 trust
|
||||
EOF
|
||||
}
|
||||
|
||||
########################
|
||||
# Create basic pg_hba.conf file
|
||||
# Globals:
|
||||
|
|
@ -301,10 +378,12 @@ postgresql_create_config() {
|
|||
#########################
|
||||
postgresql_create_pghba() {
|
||||
postgresql_info "pg_hba.conf file not detected. Generating it..."
|
||||
cat << EOF > "$POSTGRESQL_PGHBA_FILE"
|
||||
host all all 0.0.0.0/0 trust
|
||||
host all all ::1/128 trust
|
||||
EOF
|
||||
|
||||
if is_boolean_yes "$POSTGRESQL_ENABLE_LDAP"; then
|
||||
postgresql_ldap_auth_configuration
|
||||
else
|
||||
postgresql_password_auth_configuration
|
||||
fi
|
||||
}
|
||||
|
||||
########################
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
|
|||
* [`11-centos-7`, `11.5.0-centos-7-r35` (11/centos-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/11.5.0-centos-7-r35/11/centos-7/Dockerfile)
|
||||
* [`10-ol-7`, `10.10.0-ol-7-r34` (10/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/10.10.0-ol-7-r34/10/ol-7/Dockerfile)
|
||||
* [`10-debian-9`, `10.10.0-debian-9-r27`, `10`, `10.10.0`, `10.10.0-r27` (10/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/10.10.0-debian-9-r27/10/debian-9/Dockerfile)
|
||||
* [`10-centos-7`, `10.10.0-centos-7-r35` (10/centos-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/10.10.0-centos-7-r35/10/centos-7/Dockerfile)
|
||||
* [`10-centos-7`, `10.10.0-centos-7-r36` (10/centos-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/10.10.0-centos-7-r36/10/centos-7/Dockerfile)
|
||||
* [`9.6-ol-7`, `9.6.15-ol-7-r33` (9.6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/9.6.15-ol-7-r33/9.6/ol-7/Dockerfile)
|
||||
* [`9.6-debian-9`, `9.6.15-debian-9-r27`, `9.6`, `9.6.15`, `9.6.15-r27` (9.6/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/9.6.15-debian-9-r27/9.6/debian-9/Dockerfile)
|
||||
* [`9.6-centos-7`, `9.6.15-centos-7-r34` (9.6/centos-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/9.6.15-centos-7-r34/9.6/centos-7/Dockerfile)
|
||||
|
|
|
|||
Loading…
Reference in New Issue