diff --git a/bitnami/mariadb/10.9/debian-11/Dockerfile b/bitnami/mariadb/10.9/debian-11/Dockerfile index 8d417a66384b..8bbff82ec5de 100644 --- a/bitnami/mariadb/10.9/debian-11/Dockerfile +++ b/bitnami/mariadb/10.9/debian-11/Dockerfile @@ -6,10 +6,10 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-06-25T19:58:54Z" \ + org.opencontainers.image.created="2023-06-28T20:25:40Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.9.7-debian-11-r6" \ + org.opencontainers.image.ref.name="10.9.7-debian-11-r7" \ org.opencontainers.image.title="mariadb" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="10.9.7" diff --git a/bitnami/mariadb/10.9/debian-11/docker-compose.yml b/bitnami/mariadb/10.9/debian-11/docker-compose.yml index c859271b511e..20bdd8cccbe0 100644 --- a/bitnami/mariadb/10.9/debian-11/docker-compose.yml +++ b/bitnami/mariadb/10.9/debian-11/docker-compose.yml @@ -1,3 +1,6 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + version: '2.1' services: diff --git a/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 4242023f9415..184de8a117e2 100644 --- a/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Bitnami custom library diff --git a/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh index 41ebaf7464f6..63759c777f3b 100644 --- a/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh +++ b/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for managing files diff --git a/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh index eb52f7644785..96b22f99710c 100644 --- a/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for file system actions diff --git a/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh b/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh index 9694852a7d25..dadd06149e00 100644 --- a/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh +++ b/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library to use for scripts expected to be used as Kubernetes lifecycle hooks diff --git a/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh index c7c0f6d4422a..2a9e76a4d725 100644 --- a/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh +++ b/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for logging functions diff --git a/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh index 8bbf165e3e2a..b47c69a56825 100644 --- a/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh +++ b/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for network functions diff --git a/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 6d9ca8546eef..c0500acee78d 100644 --- a/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for operating system actions diff --git a/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh index 99df69681c27..af6af64d6dd0 100644 --- a/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh +++ b/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Bitnami persistence library # Used for bringing persistence capabilities to applications that don't have clear separation of data and logic diff --git a/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index d70cf0779ec8..107f54e6b5c9 100644 --- a/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/mariadb/10.9/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for managing services @@ -104,8 +106,6 @@ generate_cron_conf() { local schedule="* * * * *" local clean="true" - local clean="true" - # Parse optional CLI flags shift 2 while [[ "$#" -gt 0 ]]; do @@ -131,7 +131,12 @@ generate_cron_conf() { mkdir -p /etc/cron.d if "$clean"; then - echo "${schedule} ${run_as} ${cmd}" > /etc/cron.d/"$service_name" + cat > "/etc/cron.d/${service_name}" <> /etc/cron.d/"$service_name" fi @@ -187,7 +192,10 @@ generate_monit_conf() { is_boolean_yes "$disabled" && conf_suffix=".disabled" mkdir -p "$monit_conf_dir" - cat >"${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" < "${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" <"${logrotate_conf_dir}/${service_name}" + cat < "${logrotate_conf_dir}/${service_name}" +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + ${log_path} { ${period} rotate ${rotations} @@ -391,6 +402,9 @@ generate_systemd_conf() { fi # Generate the Systemd unit cat > "$service_file" <