diff --git a/bitnami/drupal/10/debian-12/Dockerfile b/bitnami/drupal/10/debian-12/Dockerfile index a35c9175a04b..93258ee05ea6 100644 --- a/bitnami/drupal/10/debian-12/Dockerfile +++ b/bitnami/drupal/10/debian-12/Dockerfile @@ -7,11 +7,11 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2024-07-30T17:34:06Z" \ + org.opencontainers.image.created="2024-08-02T11:35:54Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/drupal/README.md" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.3.1-debian-12-r6" \ + org.opencontainers.image.ref.name="10.3.1-debian-12-r7" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/drupal" \ org.opencontainers.image.title="drupal" \ org.opencontainers.image.vendor="Broadcom, Inc." \ @@ -31,7 +31,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ "render-template-1.0.7-2-linux-${OS_ARCH}-debian-12" \ "php-8.2.22-0-linux-${OS_ARCH}-debian-12" \ "apache-2.4.62-0-linux-${OS_ARCH}-debian-12" \ - "mysql-client-11.4.2-0-linux-${OS_ARCH}-debian-12" \ + "mysql-client-11.4.2-1-linux-${OS_ARCH}-debian-12" \ "libphp-8.2.22-0-linux-${OS_ARCH}-debian-12" \ "drupal-10.3.1-2-linux-${OS_ARCH}-debian-12" \ ) ; \ diff --git a/bitnami/drupal/10/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/drupal/10/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index b4453221a778..53a0831f3a46 100644 --- a/bitnami/drupal/10/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/drupal/10/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -21,7 +21,7 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "11.4.2-0" + "version": "11.4.2-1" }, "php": { "arch": "amd64", diff --git a/bitnami/drupal/10/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/drupal/10/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh index 3e2b3963bfbc..95e51fc097b5 100644 --- a/bitnami/drupal/10/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh +++ b/bitnami/drupal/10/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh @@ -10,6 +10,7 @@ . /opt/bitnami/scripts/liblog.sh . /opt/bitnami/scripts/libos.sh . /opt/bitnami/scripts/libvalidations.sh +. /opt/bitnami/scripts/libversion.sh ######################## # Validate settings in MYSQL_CLIENT_* environment variables @@ -1026,6 +1027,22 @@ mysql_client_extra_opts() { value="$(mysql_client_env_value "SSL_${key^^}_FILE")" [[ -n "${value}" ]] && opts+=("--ssl-${key}=${value}") done + else + # Skip SSL validation + if [[ "$(mysql_client_flavor)" = "mysql" ]]; then + opts+=("--ssl-mode=DISABLED") + else + # SSL connections are enabled by default in MariaDB >=10.11 + local mysql_version="" + local major_version="" + local minor_version="" + mysql_version="$(mysql_get_version)" + major_version="$(get_sematic_version "${mysql_version}" 1)" + minor_version="$(get_sematic_version "${mysql_version}" 2)" + if [[ "${major_version}" -gt 10 ]] || [[ "${major_version}" -eq 10 && "${minor_version}" -eq 11 ]]; then + opts+=("--skip-ssl") + fi + fi fi echo "${opts[@]:-}" }