From 7ce05ff444af850c45b681963bb8cbb603b2d149 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 24 Feb 2022 20:48:43 +0000 Subject: [PATCH] 4.36.3-debian-10-r1 release --- bitnami/ghost/4/debian-10/Dockerfile | 4 ++-- .../prebuildfs/opt/bitnami/.bitnami_components.json | 4 ++-- .../4/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh | 5 +++-- .../rootfs/opt/bitnami/scripts/libmysqlclient.sh | 9 +++++++-- bitnami/ghost/README.md | 2 +- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/bitnami/ghost/4/debian-10/Dockerfile b/bitnami/ghost/4/debian-10/Dockerfile index 2ba1e746acf7..6cc2af55dae6 100644 --- a/bitnami/ghost/4/debian-10/Dockerfile +++ b/bitnami/ghost/4/debian-10/Dockerfile @@ -9,7 +9,7 @@ ENV HOME="/" \ COPY prebuildfs / # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip jq libaudit1 libbz2-1.0 libc6 libcap-ng0 libffi6 libgcc1 libicu63 libjemalloc2 liblzma5 libncurses6 libncursesw6 libpam0g libreadline7 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libxml2 procps tar zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "python" "3.8.12-34" --checksum 68e160a809f44c15722afba7efbdce45c3347fd7c2714f1f1a4461fc2b0731fb +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "python" "3.8.12-35" --checksum 338b60596e8a45b8a55ab2831bcc05a804d423da70c296e737c41616ab11f104 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "node" "14.19.0-3" --checksum d1c0e36b98ba6464fcf517c50d35d212d8bf7626cd99838f361bbe1c47319e5e RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.34-3" --checksum ac406fd038f4e46388452ae0a9b631044d0846934be7d80a4aec21a251fe2596 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-6" --checksum 6f8fd2267481ffbe899a7f93b7b3076cd78dd70b7b9835bed79414932a749664 @@ -22,7 +22,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/ghost/postunpack.sh RUN /opt/bitnami/scripts/mysql-client/postunpack.sh ENV BITNAMI_APP_NAME="ghost" \ - BITNAMI_IMAGE_VERSION="4.36.3-debian-10-r0" \ + BITNAMI_IMAGE_VERSION="4.36.3-debian-10-r1" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/node/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:/opt/bitnami/ghost/bin:$PATH" EXPOSE 2368 3000 diff --git a/bitnami/ghost/4/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/ghost/4/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 5eca0e5f48c5..0b72421fcfc9 100644 --- a/bitnami/ghost/4/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/ghost/4/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -29,9 +29,9 @@ }, "python": { "arch": "amd64", - "digest": "68e160a809f44c15722afba7efbdce45c3347fd7c2714f1f1a4461fc2b0731fb", + "digest": "338b60596e8a45b8a55ab2831bcc05a804d423da70c296e737c41616ab11f104", "distro": "debian-10", "type": "NAMI", - "version": "3.8.12-34" + "version": "3.8.12-35" } } \ No newline at end of file diff --git a/bitnami/ghost/4/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/ghost/4/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh index 1b504b1df458..21b964ff1cf4 100644 --- a/bitnami/ghost/4/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/ghost/4/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh @@ -74,8 +74,9 @@ is_dir_empty() { # boolean ######################### is_mounted_dir_empty() { - local dir="${1:?missing directory}" - + local -r path="${1:?missing directory}" + # Calculate real path in order to avoid issues with symlinks + local -r dir="$(realpath "$path")" if is_dir_empty "$dir" || find "$dir" -mindepth 1 -maxdepth 1 -not -name ".snapshot" -not -name "lost+found" -exec false {} +; then true else diff --git a/bitnami/ghost/4/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/ghost/4/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh index d16e036df0a4..9609635e63a3 100644 --- a/bitnami/ghost/4/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh +++ b/bitnami/ghost/4/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh @@ -929,12 +929,17 @@ mysql_conf_set() { local -r key="${1:?key missing}" local -r value="${2:?value missing}" read -r -a sections <<<"${3:-mysqld}" - local -r file="${4:-"$DB_CONF_FILE"}" + local -r ignore_inline_comments="${4:-no}" + local -r file="${5:-"$DB_CONF_FILE"}" info "Setting ${key} option" debug "Setting ${key} to '${value}' in ${DB_FLAVOR} configuration file ${file}" # Check if the configuration exists in the file for section in "${sections[@]}"; do - ini-file set --section "$section" --key "$key" --value "$value" "$file" + if is_boolean_yes "$ignore_inline_comments"; then + ini-file set --ignore-inline-comments --section "$section" --key "$key" --value "$value" "$file" + else + ini-file set --section "$section" --key "$key" --value "$value" "$file" + fi done } diff --git a/bitnami/ghost/README.md b/bitnami/ghost/README.md index e33e0a0c1a35..d6c020b5f99b 100644 --- a/bitnami/ghost/README.md +++ b/bitnami/ghost/README.md @@ -43,7 +43,7 @@ Non-root container images add an extra layer of security and are generally recom 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/). -- [`4`, `4-debian-10`, `4.36.3`, `4.36.3-debian-10-r0`, `latest` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-ghost/blob/4.36.3-debian-10-r0/4/debian-10/Dockerfile) +- [`4`, `4-debian-10`, `4.36.3`, `4.36.3-debian-10-r1`, `latest` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-ghost/blob/4.36.3-debian-10-r1/4/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/ghost GitHub repo](https://github.com/bitnami/bitnami-docker-ghost).