diff --git a/bitnami/mariadb-galera/10.3/debian-10/Dockerfile b/bitnami/mariadb-galera/10.3/debian-10/Dockerfile index f74676e1aaea..d615e16d82bf 100644 --- a/bitnami/mariadb-galera/10.3/debian-10/Dockerfile +++ b/bitnami/mariadb-galera/10.3/debian-10/Dockerfile @@ -18,7 +18,7 @@ RUN mkdir /docker-entrypoint-initdb.d COPY rootfs / RUN /opt/bitnami/scripts/mariadb-galera/postunpack.sh ENV BITNAMI_APP_NAME="mariadb-galera" \ - BITNAMI_IMAGE_VERSION="10.3.31-debian-10-r72" \ + BITNAMI_IMAGE_VERSION="10.3.31-debian-10-r73" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:$PATH" EXPOSE 3306 4444 4567 4568 diff --git a/bitnami/mariadb-galera/10.3/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/mariadb-galera/10.3/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh index 4391dacc7853..8bbf165e3e2a 100644 --- a/bitnami/mariadb-galera/10.3/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh +++ b/bitnami/mariadb-galera/10.3/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh @@ -140,3 +140,24 @@ parse_uri() { esac [[ "$uri" =~ $URI_REGEX ]] && echo "${BASH_REMATCH[${index}]}" } + +######################## +# Wait for a HTTP connection to succeed +# Globals: +# * +# Arguments: +# $1 - URL to wait for +# $2 - Maximum amount of retries (optional) +# $3 - Time between retries (optional) +# Returns: +# true if the HTTP connection succeeded, false otherwise +######################### +wait_for_http_connection() { + local url="${1:?missing url}" + local retries="${2:-}" + local sleep_time="${3:-}" + if ! retry_while "debug_execute curl --silent ${url}" "$retries" "$sleep_time"; then + error "Could not connect to ${url}" + return 1 + fi +} diff --git a/bitnami/mariadb-galera/10.3/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/mariadb-galera/10.3/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh index 0b96a0be09e0..a713bd108e15 100644 --- a/bitnami/mariadb-galera/10.3/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/mariadb-galera/10.3/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -158,7 +158,7 @@ remove_cron_conf() { # $3 - Start command # $4 - Stop command # Flags: -# --disabled - Whether to disable the monit configuration +# --disable - Whether to disable the monit configuration # Returns: # None ######################### @@ -174,9 +174,8 @@ generate_monit_conf() { shift 4 while [[ "$#" -gt 0 ]]; do case "$1" in - --disabled) - shift - disabled="$1" + --disable) + disabled="yes" ;; *) echo "Invalid command line flag ${1}" >&2 diff --git a/bitnami/mariadb-galera/10.3/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/mariadb-galera/10.3/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh index dc322c377b1b..785d883f325e 100644 --- a/bitnami/mariadb-galera/10.3/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/mariadb-galera/10.3/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh @@ -164,11 +164,14 @@ web_server_reload() { # Arguments: # $1 - App name # Flags: -# --hosts - Hosts to enable # --type - Application type, which has an effect on which configuration template to use +# --hosts - Host listen addresses +# --server-name - Server name +# --server-aliases - Server aliases # --allow-remote-connections - Whether to allow remote connections or to require local connections -# --disabled - Whether to render the file with a .disabled prefix -# --enable-https - Enable app configuration on HTTPS port +# --disable - Whether to render server configurations with a .disabled prefix +# --disable-http - Whether to render the app's HTTP server configuration with a .disabled prefix +# --disable-https - Whether to render the app's HTTPS server configuration with a .disabled prefix # --http-port - HTTP port number # --https-port - HTTPS port number # --document-root - Path to document root directory @@ -198,11 +201,18 @@ ensure_web_server_app_configuration_exists() { while [[ "$#" -gt 0 ]]; do case "$1" in # Common flags + --disable \ + | --disable-http \ + | --disable-https \ + ) + apache_args+=("$1") + nginx_args+=("$1") + ;; --hosts \ + | --server-name \ + | --server-aliases \ | --type \ | --allow-remote-connections \ - | --disabled \ - | --enable-https \ | --http-port \ | --https-port \ | --document-root \ @@ -347,8 +357,13 @@ ensure_web_server_prefix_configuration_exists() { # Arguments: # $1 - App name # Flags: -# --hosts - Hosts to enable -# --enable-https - Update HTTPS app configuration +# --hosts - Host listen addresses +# --server-name - Server name +# --server-aliases - Server aliases +# --enable-http - Enable HTTP app configuration (if not enabled already) +# --enable-https - Enable HTTPS app configuration (if not enabled already) +# --disable-http - Disable HTTP app configuration (if not disabled already) +# --disable-https - Disable HTTPS app configuration (if not disabled already) # --http-port - HTTP port number # --https-port - HTTPS port number # Returns: @@ -363,8 +378,20 @@ web_server_update_app_configuration() { while [[ "$#" -gt 0 ]]; do case "$1" in # Common flags - --hosts \ + --enable-http \ | --enable-https \ + | --disable-http \ + | --disable-https \ + ) + args+=("$1") + ;; + --hosts \ + | --server-name \ + | --server-aliases \ + | --enable-http \ + | --enable-https \ + | --disable-http \ + | --disable-https \ | --http-port \ | --https-port \ ) diff --git a/bitnami/mariadb-galera/README.md b/bitnami/mariadb-galera/README.md index 37292681828b..2ae543f90dbf 100644 --- a/bitnami/mariadb-galera/README.md +++ b/bitnami/mariadb-galera/README.md @@ -52,7 +52,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`10.6`, `10.6-debian-10`, `10.6.4`, `10.6.4-debian-10-r23`, `latest` (10.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.6.4-debian-10-r23/10.6/debian-10/Dockerfile) * [`10.5`, `10.5-debian-10`, `10.5.12`, `10.5.12-debian-10-r54` (10.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.5.12-debian-10-r54/10.5/debian-10/Dockerfile) * [`10.4`, `10.4-debian-10`, `10.4.21`, `10.4.21-debian-10-r72` (10.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.4.21-debian-10-r72/10.4/debian-10/Dockerfile) -* [`10.3`, `10.3-debian-10`, `10.3.31`, `10.3.31-debian-10-r72` (10.3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.3.31-debian-10-r72/10.3/debian-10/Dockerfile) +* [`10.3`, `10.3-debian-10`, `10.3.31`, `10.3.31-debian-10-r73` (10.3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.3.31-debian-10-r73/10.3/debian-10/Dockerfile) * [`10.2`, `10.2-debian-10`, `10.2.40`, `10.2.40-debian-10-r72` (10.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.2.40-debian-10-r72/10.2/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/mariadb-galera GitHub repo](https://github.com/bitnami/bitnami-docker-mariadb-galera).