Merge branch 'main' into deprecate/supabase

bitnami · Aug 29, 2024 · 8f065a4 · 8f065a4
2 parents f2dbb02 + 950d21d
commit 8f065a4
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 15 deletions.
diff --git a/bitnami/keydb/6/debian-12/Dockerfile b/bitnami/keydb/6/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-08-27T09:46:22Z" \
+      org.opencontainers.image.created="2024-08-29T09:10:55Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/keydb/README.md" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="6.3.4-debian-12-r0" \
+      org.opencontainers.image.ref.name="6.3.4-debian-12-r1" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/keydb" \
       org.opencontainers.image.title="keydb" \
       org.opencontainers.image.vendor="Broadcom, Inc." \

diff --git a/bitnami/keydb/6/debian-12/docker-compose.yml b/bitnami/keydb/6/debian-12/docker-compose.yml
@@ -1,8 +1,6 @@
 # Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 
-version: '2'
-
 services:
   keydb:
     image: docker.io/bitnami/keydb:6

diff --git a/bitnami/keydb/docker-compose-replicaset.yml b/bitnami/keydb/docker-compose-replicaset.yml
@@ -1,8 +1,6 @@
 # Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 
-version: '2'
-
 services:
   keydb-primary:
     image: docker.io/bitnami/keydb:6

diff --git a/bitnami/keydb/docker-compose.yml b/bitnami/keydb/docker-compose.yml
@@ -1,8 +1,6 @@
 # Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 
-version: '2'
-
 services:
   keydb:
     image: docker.io/bitnami/keydb:6

diff --git a/bitnami/notation/1/debian-12/Dockerfile b/bitnami/notation/1/debian-12/Dockerfile
@@ -7,15 +7,15 @@ 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-08-07T06:11:20Z" \
+      org.opencontainers.image.created="2024-08-29T09:39:20Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/notation/README.md" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.1.1-debian-12-r6" \
+      org.opencontainers.image.ref.name="1.2.0-debian-12-r0" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/notation" \
       org.opencontainers.image.title="notation" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
-      org.opencontainers.image.version="1.1.1"
+      org.opencontainers.image.version="1.2.0"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -28,7 +28,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl procps
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
-      "notation-1.1.1-3-linux-${OS_ARCH}-debian-12" \
+      "notation-1.2.0-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -46,7 +46,7 @@ RUN chmod g+rwX /opt/bitnami
 RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true
 RUN mkdir -p "/.config" && chmod g+rwX "/.config"
 
-ENV APP_VERSION="1.1.1" \
+ENV APP_VERSION="1.2.0" \
     BITNAMI_APP_NAME="notation" \
     PATH="/opt/bitnami/notation/bin:$PATH"
 

diff --git a/bitnami/notation/1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/notation/1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "1.1.1-3"
+        "version": "1.2.0-0"
     }
 }
diff --git a/bitnami/notation/1/debian-12/tags-info.yaml b/bitnami/notation/1/debian-12/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
 - "1"
 - 1-debian-12
-- 1.1.1
+- 1.2.0
 - latest