From 9cb779fe824889f25cd4f03e66734e3f7637dd0d Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 11 Aug 2023 15:27:59 +0200 Subject: [PATCH] [bitnami/harbor-adapter-trivy] Release 2.8.3-debian-11-r4 (#44296) Signed-off-by: Bitnami Containers --- bitnami/harbor-adapter-trivy/2/debian-11/Dockerfile | 4 ++-- .../2/debian-11/rootfs/opt/bitnami/scripts/libharbor.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bitnami/harbor-adapter-trivy/2/debian-11/Dockerfile b/bitnami/harbor-adapter-trivy/2/debian-11/Dockerfile index e5855b1e9aa9..ea5a2efd7e30 100644 --- a/bitnami/harbor-adapter-trivy/2/debian-11/Dockerfile +++ b/bitnami/harbor-adapter-trivy/2/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-08-08T11:37:47Z" \ + org.opencontainers.image.created="2023-08-10T12:32:13Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.8.3-debian-11-r2" \ + org.opencontainers.image.ref.name="2.8.3-debian-11-r4" \ org.opencontainers.image.title="harbor-adapter-trivy" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.8.3" diff --git a/bitnami/harbor-adapter-trivy/2/debian-11/rootfs/opt/bitnami/scripts/libharbor.sh b/bitnami/harbor-adapter-trivy/2/debian-11/rootfs/opt/bitnami/scripts/libharbor.sh index 9f58a1aace4b..93ed16af24aa 100644 --- a/bitnami/harbor-adapter-trivy/2/debian-11/rootfs/opt/bitnami/scripts/libharbor.sh +++ b/bitnami/harbor-adapter-trivy/2/debian-11/rootfs/opt/bitnami/scripts/libharbor.sh @@ -27,7 +27,7 @@ get_system_cert_paths() { distro="$(get_os_metadata --id)" if [[ "$distro" =~ ^(debian|ubuntu)$ ]]; then echo "/etc/ssl/certs/" - elif [[ "$distro" =~ ^(centos|photon)$ ]]; then + elif [[ "$distro" =~ ^photon$ ]]; then echo "/etc/pki/tls/certs/" else # Check the existence of generic paths when OS_FLAVOR does @@ -55,7 +55,7 @@ configure_permissions_system_certs() { local -r owner="${1:-}" # Debian set_permissions_ownership "/etc/pki/tls/certs/ca-bundle.crt" "$owner" - # Centos/Phonton + # Photon set_permissions_ownership "/etc/pki/tls/certs/ca-bundle.trust.crt" "$owner" set_permissions_ownership "/etc/ssl/certs/ca-certificates.crt" "$owner" } @@ -100,7 +100,7 @@ install_cert() { if [[ "$distro" =~ ^(debian|ubuntu)$ ]]; then cat "$cert" >> /etc/ssl/certs/ca-certificates.crt - elif [[ "$distro" =~ ^(centos|photon)$ ]]; then + elif [[ "$distro" =~ ^photon$ ]]; then cat "$cert" >> /etc/pki/tls/certs/ca-bundle.crt else # Check the existence of generic ca-bundles when OS_FLAVOR does