From 550ed8aaee926f82a0694997a660a9ebc8fd94e0 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 25 Feb 2020 08:16:09 +0000 Subject: [PATCH] 10.12.0-debian-10-r12 release --- .../postgresql-repmgr/10/debian-10/Dockerfile | 2 +- .../10/debian-10/prebuildfs/libnet.sh | 59 +++++++++++++++++++ bitnami/postgresql-repmgr/README.md | 2 +- 3 files changed, 61 insertions(+), 2 deletions(-) diff --git a/bitnami/postgresql-repmgr/10/debian-10/Dockerfile b/bitnami/postgresql-repmgr/10/debian-10/Dockerfile index cc6666fa16a8..8aef9ffa0086 100644 --- a/bitnami/postgresql-repmgr/10/debian-10/Dockerfile +++ b/bitnami/postgresql-repmgr/10/debian-10/Dockerfile @@ -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-repmgr" \ - BITNAMI_IMAGE_VERSION="10.12.0-debian-10-r11" \ + BITNAMI_IMAGE_VERSION="10.12.0-debian-10-r12" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ NAMI_PREFIX="/.nami" \ diff --git a/bitnami/postgresql-repmgr/10/debian-10/prebuildfs/libnet.sh b/bitnami/postgresql-repmgr/10/debian-10/prebuildfs/libnet.sh index f884b7661fd7..c416148c5340 100644 --- a/bitnami/postgresql-repmgr/10/debian-10/prebuildfs/libnet.sh +++ b/bitnami/postgresql-repmgr/10/debian-10/prebuildfs/libnet.sh @@ -2,6 +2,9 @@ # # Library for network functions +# Load Generic Libraries +. /liblog.sh + # Functions ######################## @@ -42,3 +45,59 @@ is_hostname_resolved() { false fi } + +######################## +# Parse URL +# Globals: +# None +# Arguments: +# $1 - uri - String +# $2 - component to obtain. Valid options (scheme, authority, userinfo, host, port, path, query or fragment) - String +# Returns: +# String +parse_uri() { + local uri="${1:?uri is missing}" + local component="${2:?component is missing}" + + # Solution based on https://tools.ietf.org/html/rfc3986#appendix-B with + # additional sub-expressions to split authority into userinfo, host and port + # Credits to Patryk Obara (see https://stackoverflow.com/a/45977232/6694969) + local -r URI_REGEX='^(([^:/?#]+):)?(//((([^:/?#]+)@)?([^:/?#]+)(:([0-9]+))?))?(/([^?#]*))(\?([^#]*))?(#(.*))?' + # || | ||| | | | | | | | | | + # |2 scheme | ||6 userinfo 7 host | 9 port | 11 rpath | 13 query | 15 fragment + # 1 scheme: | |5 userinfo@ 8 :... 10 path 12 ?... 14 #... + # | 4 authority + # 3 //... + local index=0 + case "$component" in + scheme) + index=2 + ;; + authority) + index=4 + ;; + userinfo) + index=6 + ;; + host) + index=7 + ;; + port) + index=9 + ;; + path) + index=10 + ;; + query) + index=13 + ;; + fragment) + index=14 + ;; + *) + stderr_print "unrecognized component $1" + return 1 + ;; + esac + [[ "$uri" =~ $URI_REGEX ]] && echo "${BASH_REMATCH[${index}]}" +} diff --git a/bitnami/postgresql-repmgr/README.md b/bitnami/postgresql-repmgr/README.md index c4ddd1fb7cfa..9a5a01d34104 100644 --- a/bitnami/postgresql-repmgr/README.md +++ b/bitnami/postgresql-repmgr/README.md @@ -48,7 +48,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`11-ol-7`, `11.7.0-ol-7-r10` (11/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/11.7.0-ol-7-r10/11/ol-7/Dockerfile) * [`11-debian-10`, `11.7.0-debian-10-r12`, `11`, `11.7.0`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/11.7.0-debian-10-r12/11/debian-10/Dockerfile) * [`10-ol-7`, `10.12.0-ol-7-r10` (10/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/10.12.0-ol-7-r10/10/ol-7/Dockerfile) -* [`10-debian-10`, `10.12.0-debian-10-r11`, `10`, `10.12.0` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/10.12.0-debian-10-r11/10/debian-10/Dockerfile) +* [`10-debian-10`, `10.12.0-debian-10-r12`, `10`, `10.12.0` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/10.12.0-debian-10-r12/10/debian-10/Dockerfile) * [`9.6-ol-7`, `9.6.17-ol-7-r10` (9.6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/9.6.17-ol-7-r10/9.6/ol-7/Dockerfile) * [`9.6-debian-10`, `9.6.17-debian-10-r12`, `9.6`, `9.6.17` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/9.6.17-debian-10-r12/9.6/debian-10/Dockerfile)