4.0.6-centos-7-r3 release

This commit is contained in:
Bitnami Bot 2019-09-05 07:15:12 +00:00
parent 3d707069cb
commit 1e4ce5e087
4 changed files with 14 additions and 13 deletions

View File

@ -1,4 +1,4 @@
FROM bitnami/centos-extras-base:7-r125
FROM bitnami/centos-extras-base:7-r126
LABEL maintainer "Bitnami <containers@bitnami.com>"
ENV OS_ARCH="x86_64" \
@ -13,7 +13,7 @@ RUN . ./libcomponent.sh && component_unpack "pgpool" "4.0.6-0" --checksum a0e3a5
COPY rootfs /
RUN /postunpack.sh
ENV BITNAMI_APP_NAME="pgpool" \
BITNAMI_IMAGE_VERSION="4.0.6-centos-7-r2" \
BITNAMI_IMAGE_VERSION="4.0.6-centos-7-r3" \
PATH="/opt/bitnami/postgresql/bin:/opt/bitnami/pgpool/bin:$PATH"
EXPOSE 5432

View File

@ -317,19 +317,19 @@ base $PGPOOL_LDAP_BASE
binddn $PGPOOL_LDAP_BIND_DN
bindpw $PGPOOL_LDAP_BIND_PASSWORD
EOF
if [[ -n "${DB_LDAP_BASE_LOOKUP}" ]]; then
if [[ -n "${PGPOOL_LDAP_BASE_LOOKUP}" ]]; then
cat >> "/etc/nslcd.conf" << EOF
base passwd $DB_LDAP_BASE_LOOKUP
base passwd $PGPOOL_LDAP_BASE_LOOKUP
EOF
fi
if [[ -n "${DB_LDAP_SCOPE}" ]]; then
if [[ -n "${PGPOOL_LDAP_SCOPE}" ]]; then
cat >> "/etc/nslcd.conf" << EOF
scope $DB_LDAP_SCOPE
scope $PGPOOL_LDAP_SCOPE
EOF
fi
if [[ -n "${DB_LDAP_TLS_REQCERT}" ]]; then
if [[ -n "${PGPOOL_LDAP_TLS_REQCERT}" ]]; then
cat >> "/etc/nslcd.conf" << EOF
tls_reqcert $DB_LDAP_TLS_REQCERT
tls_reqcert $PGPOOL_LDAP_TLS_REQCERT
EOF
fi
chmod 600 /etc/nslcd.conf
@ -339,9 +339,10 @@ EOF
centos-*|rhel-*|ol-*) openldap_conf=/etc/openldap/ldap.conf ;;
*) ;;
esac
sed -i "s/BASE.*/BASE \"$PGPOOL_LDAP_BASE\"/" "${openldap_conf}"
sed -i "s/URI.*/URI $PGPOOL_LDAP_URI/" "${openldap_conf}"
nslcd --debug &
cat >>"${openldap_conf}"<<EOF
BASE $PGPOOL_LDAP_BASE
URI $PGPOOL_LDAP_URI
EOF
}
########################

View File

@ -20,7 +20,7 @@ readonly command=$(command -v pgpool)
flags=("-n" "--config-file=${PGPOOL_CONF_FILE}" "--hba-file=${PGPOOL_PGHBA_FILE}")
[[ -z "${PGPOOL_EXTRA_FLAGS:-}" ]] || flags=("${flags[@]}" "${PGPOOL_EXTRA_FLAGS[@]}")
is_boolean_yes "$PGPOOL_ENABLE_LDAP" && pgpool_start_nslcd
is_boolean_yes "$PGPOOL_ENABLE_LDAP" && pgpool_start_nslcd_bg
info "** Starting Pgpool-II **"
if am_i_root; then
exec gosu "$PGPOOL_DAEMON_USER" "${command}" "${flags[@]}"

View File

@ -41,7 +41,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
* [`4-ol-7`, `4.0.6-ol-7-r3` (4/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-pgpool/blob/4.0.6-ol-7-r3/4/ol-7/Dockerfile)
* [`4-debian-9`, `4.0.6-debian-9-r3`, `4`, `4.0.6`, `4.0.6-r3`, `latest` (4/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-pgpool/blob/4.0.6-debian-9-r3/4/debian-9/Dockerfile)
* [`4-centos-7`, `4.0.6-centos-7-r2` (4/centos-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-pgpool/blob/4.0.6-centos-7-r2/4/centos-7/Dockerfile)
* [`4-centos-7`, `4.0.6-centos-7-r3` (4/centos-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-pgpool/blob/4.0.6-centos-7-r3/4/centos-7/Dockerfile)
Subscribe to project updates by watching the [bitnami/pgpool GitHub repo](https://github.com/bitnami/bitnami-docker-pgpool).