diff --git a/bitnami/osclass/8/debian-10/Dockerfile b/bitnami/osclass/8/debian-10/Dockerfile index a715ecd288de..cd368fa88266 100644 --- a/bitnami/osclass/8/debian-10/Dockerfile +++ b/bitnami/osclass/8/debian-10/Dockerfile @@ -29,7 +29,7 @@ RUN /opt/bitnami/scripts/osclass/postunpack.sh ENV APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ BITNAMI_APP_NAME="osclass" \ - BITNAMI_IMAGE_VERSION="8.0.1-debian-10-r47" \ + BITNAMI_IMAGE_VERSION="8.0.1-debian-10-r48" \ PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:$PATH" EXPOSE 8080 8443 diff --git a/bitnami/osclass/8/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/osclass/8/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh index 1b504b1df458..21b964ff1cf4 100644 --- a/bitnami/osclass/8/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/osclass/8/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/osclass/8/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/osclass/8/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh index d16e036df0a4..9609635e63a3 100644 --- a/bitnami/osclass/8/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh +++ b/bitnami/osclass/8/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/osclass/README.md b/bitnami/osclass/README.md index 42856f3c097d..ec593a1b6558 100644 --- a/bitnami/osclass/README.md +++ b/bitnami/osclass/README.md @@ -43,7 +43,7 @@ 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/). -- [`8`, `8-debian-10`, `8.0.1`, `8.0.1-debian-10-r47` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-osclass/blob/8.0.1-debian-10-r47/8/debian-10/Dockerfile) +- [`8`, `8-debian-10`, `8.0.1`, `8.0.1-debian-10-r48` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-osclass/blob/8.0.1-debian-10-r48/8/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/osclass GitHub repo](https://github.com/bitnami/bitnami-docker-osclass).