10.11.0-debian-10-r10 release
This commit is contained in:
Bitnami Bot
parent
cfc407b83c
commit
179e0fc6a5
|
|
@ -22,7 +22,7 @@ RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen
|
|||
COPY rootfs /
|
||||
RUN /postunpack.sh
|
||||
ENV BITNAMI_APP_NAME="postgresql" \
|
||||
BITNAMI_IMAGE_VERSION="10.11.0-debian-10-r9" \
|
||||
BITNAMI_IMAGE_VERSION="10.11.0-debian-10-r10" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US:en" \
|
||||
NAMI_PREFIX="/.nami" \
|
||||
|
|
|
|||
|
|
@ -5,18 +5,56 @@
|
|||
# Functions
|
||||
|
||||
########################
|
||||
# Ensure a line exists in the file by replacing a matching line.
|
||||
# Replace a regex in a file
|
||||
# Arguments:
|
||||
# $1 - filename
|
||||
# $2 - line
|
||||
# $3 - match
|
||||
# $2 - match regex
|
||||
# $3 - substitute regex
|
||||
# $4 - use POSIX regex. Default: true
|
||||
# Returns:
|
||||
# None
|
||||
#########################
|
||||
file_contains_line() {
|
||||
replace_in_file() {
|
||||
local filename="${1:?filename is required}"
|
||||
local line="${2:?line is required}"
|
||||
local match="${3:?match is required}"
|
||||
local match_regex="${2:?match regex is required}"
|
||||
local substitute_regex="${3:?substitute regex is required}"
|
||||
local posix_regex=${4:-true}
|
||||
|
||||
sed --in-place "s/^$match\$/$line/" "$filename"
|
||||
local result
|
||||
|
||||
# We should avoid using 'sed in-place' substitutions
|
||||
# 1) They are not compatible with files mounted from ConfigMap(s)
|
||||
# 2) We found incompatibility issues with Debian10 and "in-place" substitutions
|
||||
if [[ $posix_regex = true ]]; then
|
||||
result="$(sed -E "s@$match_regex@$substitute_regex@g" "$filename")"
|
||||
else
|
||||
result="$(sed "s@$match_regex@$substitute_regex@g" "$filename")"
|
||||
fi
|
||||
echo "$result" > "$filename"
|
||||
}
|
||||
|
||||
########################
|
||||
# Remove a line in a file based on a regex
|
||||
# Arguments:
|
||||
# $1 - filename
|
||||
# $2 - match regex
|
||||
# $3 - use POSIX regex. Default: true
|
||||
# Returns:
|
||||
# None
|
||||
#########################
|
||||
remove_in_file() {
|
||||
local filename="${1:?filename is required}"
|
||||
local match_regex="${2:?match regex is required}"
|
||||
local posix_regex=${3:-true}
|
||||
local result
|
||||
|
||||
# We should avoid using 'sed in-place' substitutions
|
||||
# 1) They are not compatible with files mounted from ConfigMap(s)
|
||||
# 2) We found incompatibility issues with Debian10 and "in-place" substitutions
|
||||
if [[ $posix_regex = true ]]; then
|
||||
result="$(sed -E "/$match_regex/d" "$filename")"
|
||||
else
|
||||
result="$(sed "/$match_regex/d" "$filename")"
|
||||
fi
|
||||
echo "$result" > "$filename"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,9 @@
|
|||
|
||||
# Load Generic Libraries
|
||||
. /libfile.sh
|
||||
. /libfs.sh
|
||||
. /liblog.sh
|
||||
. /libos.sh
|
||||
. /libservice.sh
|
||||
. /libvalidations.sh
|
||||
|
||||
|
|
@ -415,8 +417,7 @@ EOF
|
|||
postgresql_restrict_pghba() {
|
||||
if [[ -n "$POSTGRESQL_PASSWORD" ]]; then
|
||||
local pghba_file
|
||||
pghba_file="$(sed 's/trust/md5/g' "$POSTGRESQL_PGHBA_FILE")"
|
||||
echo "$pghba_file" > "$POSTGRESQL_PGHBA_FILE"
|
||||
replace_in_file "$POSTGRESQL_PGHBA_FILE" "trust" "md5" false
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -455,8 +456,8 @@ postgresql_set_property() {
|
|||
local -r value="${2:?missing value}"
|
||||
local -r conf_file="${3:-$POSTGRESQL_CONF_FILE}"
|
||||
local psql_conf
|
||||
psql_conf="$(sed "s?^#*\s*${property}\s*=.*?${property} = '${value}'?g" "$conf_file")"
|
||||
echo "$psql_conf" > "$conf_file"
|
||||
|
||||
replace_in_file "$conf_file" "^#*\s*${property}\s*=.*" "${property} = '${value}'" false
|
||||
}
|
||||
|
||||
########################
|
||||
|
|
|
|||
|
|
@ -9,13 +9,10 @@ set -o errexit
|
|||
set -o nounset
|
||||
set -o pipefail
|
||||
|
||||
# Load Generic Libraries
|
||||
. /libfile.sh
|
||||
# Load libraries
|
||||
. /liblog.sh
|
||||
. /libservice.sh
|
||||
. /libvalidations.sh
|
||||
. /libfs.sh
|
||||
. /libos.sh
|
||||
. /libvalidations.sh
|
||||
. /libpostgresql.sh
|
||||
|
||||
# Load PostgreSQL environment variables
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
|
|||
* [`11-ol-7`, `11.6.0-ol-7-r87` (11/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.6.0-ol-7-r87/11/ol-7/Dockerfile)
|
||||
* [`11-debian-10`, `11.6.0-debian-10-r10`, `11`, `11.6.0`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.6.0-debian-10-r10/11/debian-10/Dockerfile)
|
||||
* [`10-ol-7`, `10.11.0-ol-7-r87` (10/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.11.0-ol-7-r87/10/ol-7/Dockerfile)
|
||||
* [`10-debian-10`, `10.11.0-debian-10-r9`, `10`, `10.11.0` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.11.0-debian-10-r9/10/debian-10/Dockerfile)
|
||||
* [`10-debian-10`, `10.11.0-debian-10-r10`, `10`, `10.11.0` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.11.0-debian-10-r10/10/debian-10/Dockerfile)
|
||||
* [`9.6-ol-7`, `9.6.16-ol-7-r82` (9.6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.16-ol-7-r82/9.6/ol-7/Dockerfile)
|
||||
* [`9.6-debian-10`, `9.6.16-debian-10-r10`, `9.6`, `9.6.16` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.16-debian-10-r10/9.6/debian-10/Dockerfile)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue