diff --git a/bitnami/ghost/3/debian-10/Dockerfile b/bitnami/ghost/3/debian-10/Dockerfile index 03cfc18998fe..6fe2731ff4c5 100644 --- a/bitnami/ghost/3/debian-10/Dockerfile +++ b/bitnami/ghost/3/debian-10/Dockerfile @@ -21,7 +21,7 @@ RUN /opt/bitnami/scripts/ghost/postunpack.sh RUN /opt/bitnami/scripts/mysql-client/postunpack.sh ENV ALLOW_EMPTY_PASSWORD="no" \ BITNAMI_APP_NAME="ghost" \ - BITNAMI_IMAGE_VERSION="3.42.8-debian-10-r2" \ + BITNAMI_IMAGE_VERSION="3.42.8-debian-10-r3" \ MARIADB_HOST="mariadb" \ MARIADB_PORT_NUMBER="3306" \ MARIADB_ROOT_PASSWORD="" \ diff --git a/bitnami/ghost/3/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/ghost/3/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh index 6bd564773acb..0a1a92a747f9 100644 --- a/bitnami/ghost/3/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/ghost/3/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh @@ -446,3 +446,19 @@ generate_sha_hash() { echo -n "$str" | "sha${algorithm}sum" | awk '{print $1}' } +######################## +# Converts a string to its hexadecimal representation +# Arguments: +# $1 - string +# Returns: +# hexadecimal representation of the string +######################### +convert_to_hex() { + local -r str=${1:?missing input string} + local -i iterator + local char + for ((iterator=0; iterator<${#str}; iterator++)); do + char=${str:iterator:1} + printf '%x' "'${char}" + done +} diff --git a/bitnami/ghost/3/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/ghost/3/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 459f99c7d1cd..503650210583 100644 --- a/bitnami/ghost/3/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/ghost/3/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh @@ -177,6 +177,8 @@ web_server_reload() { # --document-root - Path to document root directory # Apache-specific flags: # --apache-additional-configuration - Additional vhost configuration (no default) +# --apache-additional-http-configuration - Additional HTTP vhost configuration (no default) +# --apache-additional-https-configuration - Additional HTTPS vhost configuration (no default) # --apache-before-vhost-configuration - Configuration to add before the directive (no default) # --apache-allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no' and type is not defined) # --apache-extra-directory-configuration - Extra configuration for the document root directory @@ -224,6 +226,8 @@ ensure_web_server_app_configuration_exists() { # Specific Apache flags --apache-additional-configuration \ + | --apache-additional-http-configuration \ + | --apache-additional-https-configuration \ | --apache-before-vhost-configuration \ | --apache-allow-override \ | --apache-extra-directory-configuration \ diff --git a/bitnami/ghost/3/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/ghost/3/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh index bdd7cae7eff7..d16e036df0a4 100644 --- a/bitnami/ghost/3/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh +++ b/bitnami/ghost/3/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh @@ -478,7 +478,7 @@ mysql_upgrade() { else mysql_start_bg is_boolean_yes "${ROOT_AUTH_ENABLED:-false}" && args+=("-p$(get_master_env_var_value ROOT_PASSWORD)") - debug_execute "${DB_BIN_DIR}/mysql_upgrade" "${args[@]}" + debug_execute "${DB_BIN_DIR}/mysql_upgrade" "${args[@]}" --force fi } diff --git a/bitnami/ghost/README.md b/bitnami/ghost/README.md index e192414f0811..2ae50c8cca55 100644 --- a/bitnami/ghost/README.md +++ b/bitnami/ghost/README.md @@ -44,7 +44,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t - [`4`, `4-debian-10`, `4.32.0`, `4.32.0-debian-10-r0`, `latest` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-ghost/blob/4.32.0-debian-10-r0/4/debian-10/Dockerfile) -- [`3`, `3-debian-10`, `3.42.8`, `3.42.8-debian-10-r2` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-ghost/blob/3.42.8-debian-10-r2/3/debian-10/Dockerfile) +- [`3`, `3-debian-10`, `3.42.8`, `3.42.8-debian-10-r3` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-ghost/blob/3.42.8-debian-10-r3/3/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/ghost GitHub repo](https://github.com/bitnami/bitnami-docker-ghost).