Skip to content

Commit

Permalink
Merge branch 'bitnami:main' into fix-mysqldump-master-database
Browse files Browse the repository at this point in the history
  • Loading branch information
michel-silva authored Feb 15, 2024
2 parents e76f117 + 20ce36a commit afe7c54
Show file tree
Hide file tree
Showing 16 changed files with 139 additions and 22 deletions.
15 changes: 15 additions & 0 deletions .vib/kubescape/goss/goss.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Copyright VMware, Inc.
# SPDX-License-Identifier: APACHE-2.0

gossfile:
# Goss tests exclusive to the current container
../../kubescape/goss/kubescape.yaml: {}
# Load scripts from .vib/common/goss/templates
../../common/goss/templates/check-app-version.yaml: {}
../../common/goss/templates/check-binaries.yaml: {}
../../common/goss/templates/check-broken-symlinks.yaml: {}
../../common/goss/templates/check-ca-certs.yaml: {}
../../common/goss/templates/check-directories.yaml: {}
../../common/goss/templates/check-linked-libraries.yaml: {}
../../common/goss/templates/check-sed-in-place.yaml: {}
../../common/goss/templates/check-spdx.yaml: {}
18 changes: 18 additions & 0 deletions .vib/kubescape/goss/kubescape.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Copyright VMware, Inc.
# SPDX-License-Identifier: APACHE-2.0

command:
{{- $target := printf "/tmp/%s" (randAlpha 5) }}
check-scan:
exec: mkdir {{ $target }} && tar -xf ./kubescape/goss/testfiles/sealed-secrets.tar.gz -C {{ $target }}; kubescape scan ./kubescape/goss/testfiles/sealed-secrets.tar.gz --format=json {{ $target }}
exit-status: 0
timeout: 30000
stderr:
- "Overall compliance-score"
{{- $target := printf "/tmp/%s" (randAlpha 5) }}
check-oss-assessment:
exec: mkdir {{ $target }} && tar -xf ./kubescape/goss/testfiles/sealed-secrets.tar.gz -C {{ $target }}; /opt/bitnami/scripts/kubescape/entrypoint.sh oss-assessment {{ $target }}
exit-status: 0
timeout: 30000
stdout:
- "\"security\":"
Binary file not shown.
11 changes: 11 additions & 0 deletions .vib/kubescape/goss/vars.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
binaries:
- kubescape
root_dir: /opt/bitnami
directories:
- mode: "0775"
paths:
- /opt/bitnami/kubescape/.kubescape
- /opt/bitnami/kubescape/.cache
version:
bin_name: kubescape
flag: version
73 changes: 73 additions & 0 deletions .vib/kubescape/vib-verify.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
{
"context": {
"resources": {
"url": "{SHA_ARCHIVE}",
"path": "{VIB_ENV_PATH}"
},
"runtime_parameters": "Y29tbWFuZDogWyJ0YWlsIiwgIi1mIiwgIi9kZXYvbnVsbCJd"
},
"phases": {
"package": {
"actions": [
{
"action_id": "container-image-package",
"params": {
"application": {
"details": {
"name": "{VIB_ENV_CONTAINER}",
"tag": "{VIB_ENV_TAG}"
}
},
"architectures": [
"linux/amd64",
"linux/arm64"
]
}
},
{
"action_id": "container-image-lint",
"params": {
"threshold": "error"
}
}
]
},
"verify": {
"actions": [
{
"action_id": "trivy",
"params": {
"threshold": "LOW",
"vuln_type": [
"OS"
]
}
},
{
"action_id": "grype",
"params": {
"threshold": "CRITICAL",
"package_type": [
"OS"
]
}
},
{
"action_id": "goss",
"params": {
"resources": {
"path": "/.vib"
},
"tests_file": "kubescape/goss/goss.yaml",
"vars_file": "kubescape/goss/vars.yaml",
"remote": {
"pod": {
"workload": "deploy-kubescape"
}
}
}
}
]
}
}
}
4 changes: 2 additions & 2 deletions bitnami/apache/2.4/debian-11/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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="2024-02-15T08:45:07Z" \
org.opencontainers.image.created="2024-02-15T15:26:18Z" \
org.opencontainers.image.description="Application packaged by VMware, Inc" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="2.4.58-debian-11-r24" \
org.opencontainers.image.ref.name="2.4.58-debian-11-r25" \
org.opencontainers.image.title="apache" \
org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="2.4.58"
Expand Down
4 changes: 2 additions & 2 deletions bitnami/apisix-dashboard/3/debian-11/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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="2024-02-15T10:44:10Z" \
org.opencontainers.image.created="2024-02-15T15:23:09Z" \
org.opencontainers.image.description="Application packaged by VMware, Inc" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="3.0.1-debian-11-r158" \
org.opencontainers.image.ref.name="3.0.1-debian-11-r159" \
org.opencontainers.image.title="apisix-dashboard" \
org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="3.0.1"
Expand Down
4 changes: 2 additions & 2 deletions bitnami/dotnet/7/debian-11/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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="2024-02-15T08:59:10Z" \
org.opencontainers.image.created="2024-02-15T15:26:30Z" \
org.opencontainers.image.description="Application packaged by VMware, Inc" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="7.0.16-debian-11-r5" \
org.opencontainers.image.ref.name="7.0.16-debian-11-r6" \
org.opencontainers.image.title="dotnet" \
org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="7.0.16"
Expand Down
4 changes: 2 additions & 2 deletions bitnami/fluentd/1/debian-11/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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="2024-02-15T09:05:26Z" \
org.opencontainers.image.created="2024-02-15T15:23:10Z" \
org.opencontainers.image.description="Application packaged by VMware, Inc" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="1.16.3-debian-11-r20" \
org.opencontainers.image.ref.name="1.16.3-debian-11-r21" \
org.opencontainers.image.title="fluentd" \
org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="1.16.3"
Expand Down
4 changes: 2 additions & 2 deletions bitnami/ksql/7.2/debian-11/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,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="2024-02-15T09:30:37Z" \
org.opencontainers.image.created="2024-02-15T15:26:19Z" \
org.opencontainers.image.description="Application packaged by VMware, Inc" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="7.2.9-debian-11-r17" \
org.opencontainers.image.ref.name="7.2.9-debian-11-r18" \
org.opencontainers.image.title="ksql" \
org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="7.2.9"
Expand Down
4 changes: 2 additions & 2 deletions bitnami/kubeapps-dashboard/2/debian-11/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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="2024-02-15T09:31:12Z" \
org.opencontainers.image.created="2024-02-15T15:26:18Z" \
org.opencontainers.image.description="Application packaged by VMware, Inc" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="2.9.0-debian-11-r36" \
org.opencontainers.image.ref.name="2.9.0-debian-11-r37" \
org.opencontainers.image.title="kubeapps-dashboard" \
org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="2.9.0"
Expand Down
4 changes: 2 additions & 2 deletions bitnami/mongodb-sharded/6.0/debian-11/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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="2024-02-15T09:52:53Z" \
org.opencontainers.image.created="2024-02-15T15:26:20Z" \
org.opencontainers.image.description="Application packaged by VMware, Inc" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="6.0.13-debian-11-r17" \
org.opencontainers.image.ref.name="6.0.13-debian-11-r18" \
org.opencontainers.image.title="mongodb-sharded" \
org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="6.0.13"
Expand Down
4 changes: 2 additions & 2 deletions bitnami/mysql/8.3/debian-11/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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="2024-02-15T09:46:03Z" \
org.opencontainers.image.created="2024-02-15T15:26:17Z" \
org.opencontainers.image.description="Application packaged by VMware, Inc" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="8.3.0-debian-11-r14" \
org.opencontainers.image.ref.name="8.3.0-debian-11-r15" \
org.opencontainers.image.title="mysql" \
org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="8.3.0"
Expand Down
4 changes: 2 additions & 2 deletions bitnami/nginx/1.25/debian-11/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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="2024-02-15T09:54:19Z" \
org.opencontainers.image.created="2024-02-15T15:23:33Z" \
org.opencontainers.image.description="Application packaged by VMware, Inc" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="1.25.4-debian-11-r2" \
org.opencontainers.image.ref.name="1.25.4-debian-11-r3" \
org.opencontainers.image.title="nginx" \
org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="1.25.4"
Expand Down
4 changes: 2 additions & 2 deletions bitnami/parse/6/debian-11/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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="2024-02-15T10:00:48Z" \
org.opencontainers.image.created="2024-02-15T15:23:08Z" \
org.opencontainers.image.description="Application packaged by VMware, Inc" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="6.4.0-debian-11-r17" \
org.opencontainers.image.ref.name="6.4.0-debian-11-r18" \
org.opencontainers.image.title="parse" \
org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="6.4.0"
Expand Down
4 changes: 2 additions & 2 deletions bitnami/pgpool/4/debian-11/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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="2024-02-15T07:53:46Z" \
org.opencontainers.image.created="2024-02-15T15:23:07Z" \
org.opencontainers.image.description="Application packaged by VMware, Inc" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="4.5.0-debian-11-r17" \
org.opencontainers.image.ref.name="4.5.0-debian-11-r18" \
org.opencontainers.image.title="pgpool" \
org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="4.5.0"
Expand Down

0 comments on commit afe7c54

Please sign in to comment.