From e34a56c12135f825b054403e520f2c8e5bec3f15 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 20 Aug 2020 05:28:48 +0000 Subject: [PATCH] 9.0.3-debian-10-r3 release --- bitnami/drupal/9/debian-10/Dockerfile | 4 +- .../opt/bitnami/.bitnami_components.json | 4 +- .../opt/bitnami/scripts/libservice.sh | 38 ++++++++++++++----- .../rootfs/opt/bitnami/scripts/apache-env.sh | 8 ++-- .../rootfs/opt/bitnami/scripts/drupal-env.sh | 9 ++--- .../opt/bitnami/scripts/mysql-client-env.sh | 1 - .../rootfs/opt/bitnami/scripts/php-env.sh | 1 - bitnami/drupal/README.md | 4 +- 8 files changed, 43 insertions(+), 26 deletions(-) diff --git a/bitnami/drupal/9/debian-10/Dockerfile b/bitnami/drupal/9/debian-10/Dockerfile index 4fdf89da9e5f..12481fb368e9 100644 --- a/bitnami/drupal/9/debian-10/Dockerfile +++ b/bitnami/drupal/9/debian-10/Dockerfile @@ -15,7 +15,7 @@ RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "1 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.3.21-2" --checksum 98c4ffbfbdff56d49b9bf09b47fe5049d03a667462fd5a2b45ac658f24e40770 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.0-1" --checksum a94f94357aa06f3718db1550fa5f5188cd61383d66bf754eef49c58a18bf02cc RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-1" --checksum 51cfb1b7fd7b05b8abd1df0278c698103a9b1a4964bdacd87ca1d5c01631d59c -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "drupal" "9.0.3-0" --checksum 1603aae8e93e3d4d0f0dbe58294f0197af93c8e097ea51223190ba0a42af1fe3 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "drupal" "9.0.3-1" --checksum 4c7960c1e23ca0b6defa07883d1f3803238cdef787f4a86042fffd4d0caad26f RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami @@ -31,7 +31,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \ APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ BITNAMI_APP_NAME="drupal" \ - BITNAMI_IMAGE_VERSION="9.0.3-debian-10-r2" \ + BITNAMI_IMAGE_VERSION="9.0.3-debian-10-r3" \ DRUPAL_DATABASE_NAME="" \ DRUPAL_DATABASE_PASSWORD="" \ DRUPAL_DATABASE_USER="" \ diff --git a/bitnami/drupal/9/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/drupal/9/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 16abc5bf7aa2..fe53f2af3f4f 100644 --- a/bitnami/drupal/9/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/drupal/9/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -8,10 +8,10 @@ }, "drupal": { "arch": "amd64", - "digest": "1603aae8e93e3d4d0f0dbe58294f0197af93c8e097ea51223190ba0a42af1fe3", + "digest": "4c7960c1e23ca0b6defa07883d1f3803238cdef787f4a86042fffd4d0caad26f", "distro": "debian-10", "type": "NAMI", - "version": "9.0.3-0" + "version": "9.0.3-1" }, "gosu": { "arch": "amd64", diff --git a/bitnami/drupal/9/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/drupal/9/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh index 0fa91f65fc4f..55e1dfc4ab28 100644 --- a/bitnami/drupal/9/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/drupal/9/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -6,6 +6,7 @@ # Load Generic Libraries . /opt/bitnami/scripts/libvalidations.sh +. /opt/bitnami/scripts/liblog.sh # Functions @@ -175,23 +176,42 @@ EOF ######################## # Generate a logrotate configuration file # Arguments: -# $1 - Log path -# $2 - Period -# $3 - Number of rotations to store -# $4 - Extra options (Optional) +# $1 - Service name +# $2 - Log files pattern +# Flags: +# --period - Period +# --rotations - Number of rotations to store +# --extra - Extra options (Optional) # Returns: # None ######################### generate_logrotate_conf() { local service_name="${1:?service name is missing}" local log_path="${2:?log path is missing}" - local period="${3:-weekly}" - local rotations="${4:-150}" - local extra_options="${5:-}" + local period="weekly" + local rotations="150" + local extra="" local logrotate_conf_dir="/etc/logrotate.d" + local var_name + # Parse optional CLI flags + shift 2 + while [[ "$#" -gt 0 ]]; do + case "$1" in + --period|--rotations|--extra) + var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" + shift + declare "$var_name"="${1:?"$var_name" is missing}" + ;; + *) + echo "Invalid command line flag ${1}" >&2 + return 1 + ;; + esac + shift + done mkdir -p "$logrotate_conf_dir" - cat >"${logrotate_conf_dir}/${service_name}" <"${logrotate_conf_dir}/${service_name}" ${log_path} { ${period} rotate ${rotations} @@ -199,7 +219,7 @@ ${log_path} { compress copytruncate missingok - ${extra_options} +$(indent "$extra" 2) } EOF } diff --git a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh index e5a4aa18b097..3ed4bbad5d61 100644 --- a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh +++ b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh @@ -20,7 +20,8 @@ export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}" apache_env_vars=( APACHE_HTTP_PORT_NUMBER APACHE_HTTPS_PORT_NUMBER - + APACHE_HTTP_PORT + APACHE_HTTPS_PORT ) for env_var in "${apache_env_vars[@]}"; do file_env_var="${env_var}_FILE" @@ -58,11 +59,10 @@ export APACHE_DEFAULT_HTTP_PORT_NUMBER="8080" # only used at build time export WEB_SERVER_DEFAULT_HTTP_PORT_NUMBER="$APACHE_DEFAULT_HTTP_PORT_NUMBER" export APACHE_DEFAULT_HTTPS_PORT_NUMBER="8443" # only used at build time export WEB_SERVER_DEFAULT_HTTPS_PORT_NUMBER="$APACHE_DEFAULT_HTTPS_PORT_NUMBER" +APACHE_HTTP_PORT_NUMBER="${APACHE_HTTP_PORT_NUMBER:-"${APACHE_HTTP_PORT:-}"}" export APACHE_HTTP_PORT_NUMBER="${APACHE_HTTP_PORT_NUMBER:-}" export WEB_SERVER_HTTP_PORT_NUMBER="$APACHE_HTTP_PORT_NUMBER" - -export APACHE_HTTPS_PORT_NUMBER="${APACHE_HTTPS_PORT_NUMBER:-"${APACHE_HTTPS_PORT:-}"}" -export APACHE_HTTPS_PORT_NUMBER="${APACHE_HTTPS_PORT_NUMBER:-"${WEB_SERVER_HTTPS_PORT:-}"}" +APACHE_HTTPS_PORT_NUMBER="${APACHE_HTTPS_PORT_NUMBER:-"${APACHE_HTTPS_PORT:-}"}" export APACHE_HTTPS_PORT_NUMBER="${APACHE_HTTPS_PORT_NUMBER:-}" export WEB_SERVER_HTTPS_PORT_NUMBER="$APACHE_HTTPS_PORT_NUMBER" diff --git a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/drupal-env.sh b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/drupal-env.sh index 786c2781d03e..7556f43f4952 100644 --- a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/drupal-env.sh +++ b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/drupal-env.sh @@ -33,7 +33,8 @@ drupal_env_vars=( DRUPAL_DATABASE_PASSWORD DRUPAL_DATABASE_TLS_CA_FILE DRUPAL_DATABASE_MIN_VERSION - + MARIADB_HOST + MARIADB_PORT_NUMBER ) for env_var in "${drupal_env_vars[@]}"; do file_env_var="${env_var}_FILE" @@ -67,11 +68,9 @@ export DRUPAL_EMAIL="${DRUPAL_EMAIL:-user@example.com}" # Database configuration export DRUPAL_DEFAULT_DATABASE_HOST="mariadb" # only used at build time - -export DRUPAL_DATABASE_HOST="${DRUPAL_DATABASE_HOST:-"${MARIADB_HOST:-}"}" +DRUPAL_DATABASE_HOST="${DRUPAL_DATABASE_HOST:-"${MARIADB_HOST:-}"}" export DRUPAL_DATABASE_HOST="${DRUPAL_DATABASE_HOST:-$DRUPAL_DEFAULT_DATABASE_HOST}" - -export DRUPAL_DATABASE_PORT_NUMBER="${DRUPAL_DATABASE_PORT_NUMBER:-"${MARIADB_PORT_NUMBER:-}"}" +DRUPAL_DATABASE_PORT_NUMBER="${DRUPAL_DATABASE_PORT_NUMBER:-"${MARIADB_PORT_NUMBER:-}"}" export DRUPAL_DATABASE_PORT_NUMBER="${DRUPAL_DATABASE_PORT_NUMBER:-3306}" export DRUPAL_DATABASE_NAME="${DRUPAL_DATABASE_NAME:-bitnami_drupal}" export DRUPAL_DATABASE_USER="${DRUPAL_DATABASE_USER:-bn_drupal}" diff --git a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh index 3c3fe7cd2866..09db29621b62 100644 --- a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh +++ b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh @@ -30,7 +30,6 @@ mysql_env_vars=( MYSQL_CLIENT_CREATE_DATABASE_CHARACTER_SET MYSQL_CLIENT_CREATE_DATABASE_COLLATE MYSQL_CLIENT_TLS_ENABLED - ) for env_var in "${mysql_env_vars[@]}"; do file_env_var="${env_var}_FILE" diff --git a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/php-env.sh b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/php-env.sh index 4c9fd6739481..8ae33bca4b43 100644 --- a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/php-env.sh +++ b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/php-env.sh @@ -23,7 +23,6 @@ php_env_vars=( PHP_POST_MAX_SIZE PHP_MEMORY_LIMIT PHP_MAX_EXECUTION_TIME - ) for env_var in "${php_env_vars[@]}"; do file_env_var="${env_var}_FILE" diff --git a/bitnami/drupal/README.md b/bitnami/drupal/README.md index 51b33723337b..21dfedbe59b2 100644 --- a/bitnami/drupal/README.md +++ b/bitnami/drupal/README.md @@ -39,8 +39,8 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). -* [`9-debian-10`, `9.0.3-debian-10-r2`, `9`, `9.0.3`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.0.3-debian-10-r2/9/debian-10/Dockerfile) -* [`8-debian-10`, `8.9.3-debian-10-r4`, `8`, `8.9.3` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.9.3-debian-10-r4/8/debian-10/Dockerfile) +* [`9`, `9-debian-10`, `9.0.3`, `9.0.3-debian-10-r3`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.0.3-debian-10-r3/9/debian-10/Dockerfile) +* [`8`, `8-debian-10`, `8.9.3`, `8.9.3-debian-10-r4` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.9.3-debian-10-r4/8/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/drupal GitHub repo](https://github.com/bitnami/bitnami-docker-drupal).