diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml index 9b10b13b9f2d..46ea72582352 100644 --- a/.github/workflows/ci-pipeline.yml +++ b/.github/workflows/ci-pipeline.yml @@ -80,6 +80,7 @@ jobs: run: | if [[ -d "${{ matrix.container }}" ]]; then name="$(echo "${{ matrix.container }}" | awk -F '/' '{print $2}')" + branch="$(echo "${{ matrix.container }}" | awk -F '/' '{print $3}')" tag="" if [[ "${{ github.event.pull_request.user.login }}" == "bitnami-bot" ]]; then tag="$(grep -oE "org.opencontainers.image.ref.name=\".+\"" ${{ matrix.container }}/Dockerfile | sed -nr "s|org.opencontainers.image.ref.name=\"(.+)\"|\1|p")" @@ -91,8 +92,13 @@ jobs: echo "No tag found for: ${{ matrix.container }}" exit 1 else + dsl_path="${name}" + if [[ -d ".vib/${dsl_path}/${branch}" ]]; then + dsl_path="${dsl_path}/${branch}" + fi echo "tag=${tag}" >> $GITHUB_OUTPUT echo "name=${name}" >> $GITHUB_OUTPUT + echo "dsl_path=${dsl_path}" >> $GITHUB_OUTPUT echo "result=ok" >> $GITHUB_OUTPUT fi else @@ -103,12 +109,12 @@ jobs: name: Verify if: ${{ steps.get-container-metadata.outputs.result == 'ok' }} with: - pipeline: ${{ steps.get-container-metadata.outputs.name }}/vib-verify.json + pipeline: ${{ steps.get-container-metadata.outputs.dsl_path }}/vib-verify.json env: # Path with docker resources VIB_ENV_PATH: ${{ matrix.container }} # Container name - VIB_ENV_CONTAINER: ${{ steps.get-container-metadata.outputs.name }} + VIB_ENV_CONTAINER: ${{ steps.get-container-metadata.outputs.name }} VIB_ENV_TAG: ${{ steps.get-container-metadata.outputs.tag }} verification-summary: # Ensure all containers passed the verification diff --git a/.vib/acmesolver/vib-verify.json b/.vib/acmesolver/vib-verify.json index 6d6022ee016c..0461bbb47633 100644 --- a/.vib/acmesolver/vib-verify.json +++ b/.vib/acmesolver/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/airflow-exporter/vib-verify.json b/.vib/airflow-exporter/vib-verify.json index 7c9e214dabb2..8c54e3867ed9 100644 --- a/.vib/airflow-exporter/vib-verify.json +++ b/.vib/airflow-exporter/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/airflow-scheduler/vib-verify.json b/.vib/airflow-scheduler/vib-verify.json index c8c3385003c9..beb4fc666596 100644 --- a/.vib/airflow-scheduler/vib-verify.json +++ b/.vib/airflow-scheduler/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/airflow-worker/vib-verify.json b/.vib/airflow-worker/vib-verify.json index 811728674a25..d1083aca0452 100644 --- a/.vib/airflow-worker/vib-verify.json +++ b/.vib/airflow-worker/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/airflow/vib-verify.json b/.vib/airflow/vib-verify.json index d3e58cdce791..7e79de6ce061 100644 --- a/.vib/airflow/vib-verify.json +++ b/.vib/airflow/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/alertmanager/vib-verify.json b/.vib/alertmanager/vib-verify.json index 087fd2401e84..7f92da36dc9b 100644 --- a/.vib/alertmanager/vib-verify.json +++ b/.vib/alertmanager/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/apache-exporter/vib-verify.json b/.vib/apache-exporter/vib-verify.json index ef16f91e4a7d..e36dc136df54 100644 --- a/.vib/apache-exporter/vib-verify.json +++ b/.vib/apache-exporter/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/apache/vib-verify.json b/.vib/apache/vib-verify.json index 5e0e6294e2c9..6acf7cd4cfbf 100644 --- a/.vib/apache/vib-verify.json +++ b/.vib/apache/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/apisix-dashboard/vib-verify.json b/.vib/apisix-dashboard/vib-verify.json index 75cdfc9bf412..42ce935e8ad9 100644 --- a/.vib/apisix-dashboard/vib-verify.json +++ b/.vib/apisix-dashboard/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/apisix-ingress-controller/vib-verify.json b/.vib/apisix-ingress-controller/vib-verify.json index 7487eef026e2..e19fd32e0828 100644 --- a/.vib/apisix-ingress-controller/vib-verify.json +++ b/.vib/apisix-ingress-controller/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/apisix/vib-verify.json b/.vib/apisix/vib-verify.json index fb40e572e840..d8cd2fe9298a 100644 --- a/.vib/apisix/vib-verify.json +++ b/.vib/apisix/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/appsmith/vib-verify.json b/.vib/appsmith/vib-verify.json index b0d999cb652d..8be14511e5cc 100644 --- a/.vib/appsmith/vib-verify.json +++ b/.vib/appsmith/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/argo-cd/vib-verify.json b/.vib/argo-cd/vib-verify.json index d8934ab80bc3..40ae9aecac03 100644 --- a/.vib/argo-cd/vib-verify.json +++ b/.vib/argo-cd/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/argo-workflow-cli/vib-verify.json b/.vib/argo-workflow-cli/vib-verify.json index a34e8aee9161..82f78c1a2b77 100644 --- a/.vib/argo-workflow-cli/vib-verify.json +++ b/.vib/argo-workflow-cli/vib-verify.json @@ -16,7 +16,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/argo-workflow-controller/vib-verify.json b/.vib/argo-workflow-controller/vib-verify.json index a34e8aee9161..82f78c1a2b77 100644 --- a/.vib/argo-workflow-controller/vib-verify.json +++ b/.vib/argo-workflow-controller/vib-verify.json @@ -16,7 +16,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/argo-workflow-exec/vib-verify.json b/.vib/argo-workflow-exec/vib-verify.json index 737f184d4e4e..c7fe2fc24421 100644 --- a/.vib/argo-workflow-exec/vib-verify.json +++ b/.vib/argo-workflow-exec/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/aspnet-core/vib-verify.json b/.vib/aspnet-core/vib-verify.json index c9d8a902c725..4ed5e40da825 100644 --- a/.vib/aspnet-core/vib-verify.json +++ b/.vib/aspnet-core/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/attu/vib-verify.json b/.vib/attu/vib-verify.json index c3fc1b0cc5fb..b94654705f73 100644 --- a/.vib/attu/vib-verify.json +++ b/.vib/attu/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { @@ -49,14 +53,18 @@ "action_id": "trivy", "params": { "threshold": "CRITICAL", - "vuln_type": ["OS"] + "vuln_type": [ + "OS" + ] } }, { "action_id": "grype", "params": { "threshold": "CRITICAL", - "package_type": ["OS"] + "package_type": [ + "OS" + ] } } ] diff --git a/.vib/aws-cli/vib-verify.json b/.vib/aws-cli/vib-verify.json index 4f5a00ca324f..7f2da6c91e44 100644 --- a/.vib/aws-cli/vib-verify.json +++ b/.vib/aws-cli/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/azure-cli/vib-verify.json b/.vib/azure-cli/vib-verify.json index f8999f9169cc..2f9f53381a20 100644 --- a/.vib/azure-cli/vib-verify.json +++ b/.vib/azure-cli/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/blackbox-exporter/vib-verify.json b/.vib/blackbox-exporter/vib-verify.json index c9ff464a9afb..2d2a573226a2 100644 --- a/.vib/blackbox-exporter/vib-verify.json +++ b/.vib/blackbox-exporter/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/cainjector/vib-verify.json b/.vib/cainjector/vib-verify.json index 699a05be39ae..4051fff0aad0 100644 --- a/.vib/cainjector/vib-verify.json +++ b/.vib/cainjector/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/cassandra-exporter/vib-verify.json b/.vib/cassandra-exporter/vib-verify.json index 68f9e2208a60..514e7d3db8a2 100644 --- a/.vib/cassandra-exporter/vib-verify.json +++ b/.vib/cassandra-exporter/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/cassandra/vib-verify.json b/.vib/cassandra/vib-verify.json index 7f1f3a905bcd..dd6ccc50e6c1 100644 --- a/.vib/cassandra/vib-verify.json +++ b/.vib/cassandra/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/cert-manager-webhook/vib-verify.json b/.vib/cert-manager-webhook/vib-verify.json index f464de97aeb7..29ef991e9875 100644 --- a/.vib/cert-manager-webhook/vib-verify.json +++ b/.vib/cert-manager-webhook/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/cert-manager/vib-verify.json b/.vib/cert-manager/vib-verify.json index a72ac7830062..451430e68b22 100644 --- a/.vib/cert-manager/vib-verify.json +++ b/.vib/cert-manager/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/clickhouse/vib-verify.json b/.vib/clickhouse/vib-verify.json index b153b6333be4..c67560273969 100644 --- a/.vib/clickhouse/vib-verify.json +++ b/.vib/clickhouse/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/cluster-autoscaler/vib-verify.json b/.vib/cluster-autoscaler/vib-verify.json index 45947c8eec4b..d3d74f9312b1 100644 --- a/.vib/cluster-autoscaler/vib-verify.json +++ b/.vib/cluster-autoscaler/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/codeigniter/vib-verify.json b/.vib/codeigniter/vib-verify.json index 1dbb425f3a76..5e64288032e2 100644 --- a/.vib/codeigniter/vib-verify.json +++ b/.vib/codeigniter/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/concourse/vib-verify.json b/.vib/concourse/vib-verify.json index 2a8a3e0e928a..22c6f095acd3 100644 --- a/.vib/concourse/vib-verify.json +++ b/.vib/concourse/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/configmap-reload/vib-verify.json b/.vib/configmap-reload/vib-verify.json index f3a891f70842..984b4d8e225f 100644 --- a/.vib/configmap-reload/vib-verify.json +++ b/.vib/configmap-reload/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/configurable-http-proxy/vib-verify.json b/.vib/configurable-http-proxy/vib-verify.json index 51e551a4ca7b..1ddeddfb9e70 100644 --- a/.vib/configurable-http-proxy/vib-verify.json +++ b/.vib/configurable-http-proxy/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/consul-exporter/vib-verify.json b/.vib/consul-exporter/vib-verify.json index 96ffe2e2b761..75c5021bdb48 100644 --- a/.vib/consul-exporter/vib-verify.json +++ b/.vib/consul-exporter/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/consul/vib-verify.json b/.vib/consul/vib-verify.json index 119c392475c1..8b8e9d82c4cc 100644 --- a/.vib/consul/vib-verify.json +++ b/.vib/consul/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/contour/vib-verify.json b/.vib/contour/vib-verify.json index ac097f78e98f..8ba7b1c9850e 100644 --- a/.vib/contour/vib-verify.json +++ b/.vib/contour/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/cosign/vib-verify.json b/.vib/cosign/vib-verify.json index 4b23ec2b67ee..0050057553cf 100644 --- a/.vib/cosign/vib-verify.json +++ b/.vib/cosign/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/couchdb/vib-verify.json b/.vib/couchdb/vib-verify.json index c9c8ac44dada..04085809ab7c 100644 --- a/.vib/couchdb/vib-verify.json +++ b/.vib/couchdb/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/deepspeed/vib-verify.json b/.vib/deepspeed/vib-verify.json index 0e4f80c4e892..854033fd995f 100644 --- a/.vib/deepspeed/vib-verify.json +++ b/.vib/deepspeed/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { @@ -49,14 +53,18 @@ "action_id": "trivy", "params": { "threshold": "CRITICAL", - "vuln_type": ["OS"] + "vuln_type": [ + "OS" + ] } }, { "action_id": "grype", "params": { "threshold": "CRITICAL", - "package_type": ["OS"] + "package_type": [ + "OS" + ] } } ] diff --git a/.vib/dex/vib-verify.json b/.vib/dex/vib-verify.json index c7522f264319..d478f9ec3e58 100644 --- a/.vib/dex/vib-verify.json +++ b/.vib/dex/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/discourse/vib-verify.json b/.vib/discourse/vib-verify.json index 2a60e6a4dc80..3843a036aaf8 100644 --- a/.vib/discourse/vib-verify.json +++ b/.vib/discourse/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/dokuwiki/vib-verify.json b/.vib/dokuwiki/vib-verify.json index a3fb96079d30..ae7f50acffc2 100644 --- a/.vib/dokuwiki/vib-verify.json +++ b/.vib/dokuwiki/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/dotnet-sdk/vib-verify.json b/.vib/dotnet-sdk/vib-verify.json index aa3576c1c0ea..a3d9d51cde10 100644 --- a/.vib/dotnet-sdk/vib-verify.json +++ b/.vib/dotnet-sdk/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/dotnet/vib-verify.json b/.vib/dotnet/vib-verify.json index e67d6898e904..094104ea93b3 100644 --- a/.vib/dotnet/vib-verify.json +++ b/.vib/dotnet/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/drupal-nginx/vib-verify.json b/.vib/drupal-nginx/vib-verify.json index 608b397cd68d..a70b5f8e6475 100644 --- a/.vib/drupal-nginx/vib-verify.json +++ b/.vib/drupal-nginx/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/drupal/vib-verify.json b/.vib/drupal/vib-verify.json index 195237857252..4986aab9b1a1 100644 --- a/.vib/drupal/vib-verify.json +++ b/.vib/drupal/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/ejbca/vib-verify.json b/.vib/ejbca/vib-verify.json index 7346e63dd83e..0c4377d01b0e 100644 --- a/.vib/ejbca/vib-verify.json +++ b/.vib/ejbca/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/elasticsearch-exporter/vib-verify.json b/.vib/elasticsearch-exporter/vib-verify.json index 2ef7da8aa71f..347bbeb5cc20 100644 --- a/.vib/elasticsearch-exporter/vib-verify.json +++ b/.vib/elasticsearch-exporter/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/elasticsearch/vib-verify.json b/.vib/elasticsearch/vib-verify.json index 8d2229af356f..32cca577b876 100644 --- a/.vib/elasticsearch/vib-verify.json +++ b/.vib/elasticsearch/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/envoy/vib-verify.json b/.vib/envoy/vib-verify.json index 6f3e3c8614cb..1f4148d0fb55 100644 --- a/.vib/envoy/vib-verify.json +++ b/.vib/envoy/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/envoy/1.20/vib-publish.json b/.vib/etcd/3.4/vib-verify.json similarity index 50% rename from .vib/envoy/1.20/vib-publish.json rename to .vib/etcd/3.4/vib-verify.json index 1e2aad8ef471..f4c68eff40c3 100644 --- a/.vib/envoy/1.20/vib-publish.json +++ b/.vib/etcd/3.4/vib-verify.json @@ -1,9 +1,10 @@ { "context": { "resources": { - "url": "{VIB_ENV_CONTAINER_URL}", + "url": "{SHA_ARCHIVE}", "path": "{VIB_ENV_PATH}" - } + }, + "runtime_parameters": "Y29tbWFuZDogWyJ0YWlsIiwgIi1mIiwgIi9kZXYvbnVsbCJd" }, "phases": { "package": { @@ -32,6 +33,21 @@ }, "verify": { "actions": [ + { + "action_id": "goss", + "params": { + "resources": { + "path": "/.vib" + }, + "tests_file": "etcd/goss/goss.yaml", + "vars_file": "etcd/goss/vars.yaml", + "remote": { + "pod": { + "workload": "deploy-etcd" + } + } + } + }, { "action_id": "trivy", "params": { @@ -49,46 +65,6 @@ "OS" ] } - }, - { - "action_id": "osspi-application", - "params": { - "additional_packages_file": "osspi-packages-amd64.json", - "scan_type": "BASE_OS", - "osm": { - "associated_bossd_release": "{VIB_ENV_BOSSD_RELEASE_ID}", - "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" - }, - "resources": { - "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/{VIB_ENV_PATH}", - "authn": { - "header": "Authorization", - "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" - } - } - } - } - ] - }, - "publish": { - "actions": [ - { - "action_id": "container-image-publish", - "params": { - "metadata": { - "tags": {VIB_ENV_ROLLING_TAGS} - }, - "repository": { - "kind": "OCI", - "url": "{VIB_ENV_REGISTRY_URL}", - "authn": { - "username": "{VIB_ENV_REGISTRY_USERNAME}", - "password": "{VIB_ENV_REGISTRY_PASSWORD}" - } - } - } } ] } diff --git a/.vib/etcd/vib-verify.json b/.vib/etcd/vib-verify.json index 08d2445b02ef..ddc783d5e2b0 100644 --- a/.vib/etcd/vib-verify.json +++ b/.vib/etcd/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/express/vib-verify.json b/.vib/express/vib-verify.json index 60d6d830c8ff..1bece01f00e2 100644 --- a/.vib/express/vib-verify.json +++ b/.vib/express/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/external-dns/vib-verify.json b/.vib/external-dns/vib-verify.json index b093af5bee11..b5238612956e 100644 --- a/.vib/external-dns/vib-verify.json +++ b/.vib/external-dns/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/flink/vib-verify.json b/.vib/flink/vib-verify.json index dae8c872191e..2b879918cf22 100644 --- a/.vib/flink/vib-verify.json +++ b/.vib/flink/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/fluent-bit/vib-verify.json b/.vib/fluent-bit/vib-verify.json index de8e39eaf7f0..fe00c8fe6c05 100644 --- a/.vib/fluent-bit/vib-verify.json +++ b/.vib/fluent-bit/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/fluentd/vib-verify.json b/.vib/fluentd/vib-verify.json index 739f49881abe..e45acc402544 100644 --- a/.vib/fluentd/vib-verify.json +++ b/.vib/fluentd/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/fluxcd-helm-controller/vib-verify.json b/.vib/fluxcd-helm-controller/vib-verify.json index 2909a03b46b0..8c5d70a36bae 100644 --- a/.vib/fluxcd-helm-controller/vib-verify.json +++ b/.vib/fluxcd-helm-controller/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/fluxcd-image-automation-controller/vib-verify.json b/.vib/fluxcd-image-automation-controller/vib-verify.json index 2ec592aa3684..8a24935b4cd2 100644 --- a/.vib/fluxcd-image-automation-controller/vib-verify.json +++ b/.vib/fluxcd-image-automation-controller/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/fluxcd-image-reflector-controller/vib-verify.json b/.vib/fluxcd-image-reflector-controller/vib-verify.json index 2bd0b21660a0..946a135d2214 100644 --- a/.vib/fluxcd-image-reflector-controller/vib-verify.json +++ b/.vib/fluxcd-image-reflector-controller/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/fluxcd-kustomize-controller/vib-verify.json b/.vib/fluxcd-kustomize-controller/vib-verify.json index 5a26afbba0ec..133a2e20a6cb 100644 --- a/.vib/fluxcd-kustomize-controller/vib-verify.json +++ b/.vib/fluxcd-kustomize-controller/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/fluxcd-notification-controller/vib-verify.json b/.vib/fluxcd-notification-controller/vib-verify.json index a912c32dc564..00ec70a27207 100644 --- a/.vib/fluxcd-notification-controller/vib-verify.json +++ b/.vib/fluxcd-notification-controller/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/fluxcd-source-controller/vib-verify.json b/.vib/fluxcd-source-controller/vib-verify.json index bd65db4904e5..613a2d4076a2 100644 --- a/.vib/fluxcd-source-controller/vib-verify.json +++ b/.vib/fluxcd-source-controller/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/ghost/vib-verify.json b/.vib/ghost/vib-verify.json index 87d7312f13da..c85a22a05c5d 100644 --- a/.vib/ghost/vib-verify.json +++ b/.vib/ghost/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/git/vib-verify.json b/.vib/git/vib-verify.json index 0568c81b46d9..498e63e83849 100644 --- a/.vib/git/vib-verify.json +++ b/.vib/git/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/gitea/vib-verify.json b/.vib/gitea/vib-verify.json index 9edbac8e7ed7..098040ee88b9 100644 --- a/.vib/gitea/vib-verify.json +++ b/.vib/gitea/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/gitlab-runner-helper/vib-verify.json b/.vib/gitlab-runner-helper/vib-verify.json index 6bfe3fd1a229..7232ed59c952 100644 --- a/.vib/gitlab-runner-helper/vib-verify.json +++ b/.vib/gitlab-runner-helper/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/gitlab-runner/vib-verify.json b/.vib/gitlab-runner/vib-verify.json index df292f924911..920549c9acb7 100644 --- a/.vib/gitlab-runner/vib-verify.json +++ b/.vib/gitlab-runner/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/golang/vib-verify.json b/.vib/golang/vib-verify.json index 03a810b5e27a..53dd58915b08 100644 --- a/.vib/golang/vib-verify.json +++ b/.vib/golang/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/google-cloud-sdk/vib-verify.json b/.vib/google-cloud-sdk/vib-verify.json index 86473554cc37..a015da5d665a 100644 --- a/.vib/google-cloud-sdk/vib-verify.json +++ b/.vib/google-cloud-sdk/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/gotrue/vib-verify.json b/.vib/gotrue/vib-verify.json index 10e0a536f29e..47fb285b3871 100644 --- a/.vib/gotrue/vib-verify.json +++ b/.vib/gotrue/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/gradle/vib-verify.json b/.vib/gradle/vib-verify.json index e0a32e4a93cf..688f6f072b38 100644 --- a/.vib/gradle/vib-verify.json +++ b/.vib/gradle/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/grafana-image-renderer/vib-verify.json b/.vib/grafana-image-renderer/vib-verify.json index 974f0eb0b930..8216c98c2d97 100644 --- a/.vib/grafana-image-renderer/vib-verify.json +++ b/.vib/grafana-image-renderer/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/grafana-loki/vib-verify.json b/.vib/grafana-loki/vib-verify.json index 9f8815b2e050..c937e32804f1 100644 --- a/.vib/grafana-loki/vib-verify.json +++ b/.vib/grafana-loki/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/grafana-mimir/vib-verify.json b/.vib/grafana-mimir/vib-verify.json index 0adf6cd6c095..04f9f5f2c513 100644 --- a/.vib/grafana-mimir/vib-verify.json +++ b/.vib/grafana-mimir/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/grafana-operator/vib-verify.json b/.vib/grafana-operator/vib-verify.json index cdc6a7a9f861..9a1cab851062 100644 --- a/.vib/grafana-operator/vib-verify.json +++ b/.vib/grafana-operator/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/grafana-tempo-query/vib-verify.json b/.vib/grafana-tempo-query/vib-verify.json index 51db3dc06d12..2b2f0b4f343f 100644 --- a/.vib/grafana-tempo-query/vib-verify.json +++ b/.vib/grafana-tempo-query/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/grafana-tempo-vulture/vib-verify.json b/.vib/grafana-tempo-vulture/vib-verify.json index a3522a263219..9d614fbf6bb6 100644 --- a/.vib/grafana-tempo-vulture/vib-verify.json +++ b/.vib/grafana-tempo-vulture/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/grafana-tempo/vib-verify.json b/.vib/grafana-tempo/vib-verify.json index f40ece93b1bf..a202424b4616 100644 --- a/.vib/grafana-tempo/vib-verify.json +++ b/.vib/grafana-tempo/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/grafana/vib-verify.json b/.vib/grafana/vib-verify.json index 2f6574ca1e3b..1551a654e825 100644 --- a/.vib/grafana/vib-verify.json +++ b/.vib/grafana/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/haproxy/vib-verify.json b/.vib/haproxy/vib-verify.json index 11e08d7196f9..3590dc9b3c0f 100644 --- a/.vib/haproxy/vib-verify.json +++ b/.vib/haproxy/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/harbor-adapter-trivy/vib-verify.json b/.vib/harbor-adapter-trivy/vib-verify.json index 8220a41ff502..ac17ae116aee 100644 --- a/.vib/harbor-adapter-trivy/vib-verify.json +++ b/.vib/harbor-adapter-trivy/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/harbor-core/vib-verify.json b/.vib/harbor-core/vib-verify.json index e8a1fa844c3b..cfcb112df1ec 100644 --- a/.vib/harbor-core/vib-verify.json +++ b/.vib/harbor-core/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/harbor-exporter/vib-verify.json b/.vib/harbor-exporter/vib-verify.json index aefd4ae348ac..b43be8642414 100644 --- a/.vib/harbor-exporter/vib-verify.json +++ b/.vib/harbor-exporter/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/harbor-jobservice/vib-verify.json b/.vib/harbor-jobservice/vib-verify.json index d85a412c2cd6..5dc5a608632f 100644 --- a/.vib/harbor-jobservice/vib-verify.json +++ b/.vib/harbor-jobservice/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/harbor-notary-server/vib-verify.json b/.vib/harbor-notary-server/vib-verify.json index f617c78c6b30..87668ac26bc1 100644 --- a/.vib/harbor-notary-server/vib-verify.json +++ b/.vib/harbor-notary-server/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/harbor-notary-signer/vib-verify.json b/.vib/harbor-notary-signer/vib-verify.json index c6f98d9a8dde..be665a05b57f 100644 --- a/.vib/harbor-notary-signer/vib-verify.json +++ b/.vib/harbor-notary-signer/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/harbor-portal/vib-verify.json b/.vib/harbor-portal/vib-verify.json index 1b44530f1236..daa0e58f0226 100644 --- a/.vib/harbor-portal/vib-verify.json +++ b/.vib/harbor-portal/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/harbor-registry/vib-verify.json b/.vib/harbor-registry/vib-verify.json index 67aedd37cdc8..f0376bf70fd3 100644 --- a/.vib/harbor-registry/vib-verify.json +++ b/.vib/harbor-registry/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/harbor-registryctl/vib-verify.json b/.vib/harbor-registryctl/vib-verify.json index 7eef59bce6e7..d08065bab5f3 100644 --- a/.vib/harbor-registryctl/vib-verify.json +++ b/.vib/harbor-registryctl/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/influxdb/vib-verify.json b/.vib/influxdb/vib-verify.json index 451f204c4526..10e536334161 100644 --- a/.vib/influxdb/vib-verify.json +++ b/.vib/influxdb/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/jaeger/vib-verify.json b/.vib/jaeger/vib-verify.json index 1d03f7f2168a..5a8853fb2824 100644 --- a/.vib/jaeger/vib-verify.json +++ b/.vib/jaeger/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/jasperreports/vib-verify.json b/.vib/jasperreports/vib-verify.json index 7359556dbadd..a67773250567 100644 --- a/.vib/jasperreports/vib-verify.json +++ b/.vib/jasperreports/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/java/vib-verify.json b/.vib/java/vib-verify.json index 1d16434dca31..e2accb6cf72f 100644 --- a/.vib/java/vib-verify.json +++ b/.vib/java/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/jax/vib-verify.json b/.vib/jax/vib-verify.json index 05a5323bae77..f37092d20672 100644 --- a/.vib/jax/vib-verify.json +++ b/.vib/jax/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { @@ -49,14 +53,18 @@ "action_id": "trivy", "params": { "threshold": "CRITICAL", - "vuln_type": ["OS"] + "vuln_type": [ + "OS" + ] } }, { "action_id": "grype", "params": { "threshold": "CRITICAL", - "package_type": ["OS"] + "package_type": [ + "OS" + ] } } ] diff --git a/.vib/jenkins-agent/vib-verify.json b/.vib/jenkins-agent/vib-verify.json index 64503bee4f8c..fbd60ca3247a 100644 --- a/.vib/jenkins-agent/vib-verify.json +++ b/.vib/jenkins-agent/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/jenkins/vib-verify.json b/.vib/jenkins/vib-verify.json index e1165f2ed904..41aa1ee116aa 100644 --- a/.vib/jenkins/vib-verify.json +++ b/.vib/jenkins/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/jmx-exporter/vib-verify.json b/.vib/jmx-exporter/vib-verify.json index c5c326fdde61..220cd27d952a 100644 --- a/.vib/jmx-exporter/vib-verify.json +++ b/.vib/jmx-exporter/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/joomla/vib-verify.json b/.vib/joomla/vib-verify.json index 51ae40feb9fa..4e469ccc4722 100644 --- a/.vib/joomla/vib-verify.json +++ b/.vib/joomla/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/jruby/vib-verify.json b/.vib/jruby/vib-verify.json index 2204683e80dd..08e0fb88ffbd 100644 --- a/.vib/jruby/vib-verify.json +++ b/.vib/jruby/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/jsonnet/vib-verify.json b/.vib/jsonnet/vib-verify.json index d72c91e4c4d2..8f08d8d1d0a5 100644 --- a/.vib/jsonnet/vib-verify.json +++ b/.vib/jsonnet/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/jupyter-base-notebook/vib-verify.json b/.vib/jupyter-base-notebook/vib-verify.json index 346b000065b5..4655b0e2c55c 100644 --- a/.vib/jupyter-base-notebook/vib-verify.json +++ b/.vib/jupyter-base-notebook/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/jupyterhub/vib-verify.json b/.vib/jupyterhub/vib-verify.json index 39ef25665f38..4ae1f6e2e014 100644 --- a/.vib/jupyterhub/vib-verify.json +++ b/.vib/jupyterhub/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/jwt-cli/vib-verify.json b/.vib/jwt-cli/vib-verify.json index 87a454c2a88e..bf6b7023ec11 100644 --- a/.vib/jwt-cli/vib-verify.json +++ b/.vib/jwt-cli/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/kafka-exporter/vib-verify.json b/.vib/kafka-exporter/vib-verify.json index 90fa8adbcc98..876c2c40dd65 100644 --- a/.vib/kafka-exporter/vib-verify.json +++ b/.vib/kafka-exporter/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/kafka/vib-verify.json b/.vib/kafka/vib-verify.json index dea5d2f81ade..31fd9d628a84 100644 --- a/.vib/kafka/vib-verify.json +++ b/.vib/kafka/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/kaniko/vib-verify.json b/.vib/kaniko/vib-verify.json index a34e8aee9161..82f78c1a2b77 100644 --- a/.vib/kaniko/vib-verify.json +++ b/.vib/kaniko/vib-verify.json @@ -16,7 +16,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/kapacitor/vib-verify.json b/.vib/kapacitor/vib-verify.json index edf3b2f68832..f8be3a5fa0bf 100644 --- a/.vib/kapacitor/vib-verify.json +++ b/.vib/kapacitor/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/keycloak-config-cli/vib-verify.json b/.vib/keycloak-config-cli/vib-verify.json index 31e934554635..3b899de91b76 100644 --- a/.vib/keycloak-config-cli/vib-verify.json +++ b/.vib/keycloak-config-cli/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/keycloak/vib-verify.json b/.vib/keycloak/vib-verify.json index 7ff619171db9..2681300a4868 100644 --- a/.vib/keycloak/vib-verify.json +++ b/.vib/keycloak/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/kiam/vib-verify.json b/.vib/kiam/vib-verify.json index 5765cfe2db40..2762222cf59e 100644 --- a/.vib/kiam/vib-verify.json +++ b/.vib/kiam/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/kibana/vib-verify.json b/.vib/kibana/vib-verify.json index 2fcde7036008..8e8a88b77389 100644 --- a/.vib/kibana/vib-verify.json +++ b/.vib/kibana/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/kong-ingress-controller/vib-verify.json b/.vib/kong-ingress-controller/vib-verify.json index 1082a7c6dff1..6879dbe08194 100644 --- a/.vib/kong-ingress-controller/vib-verify.json +++ b/.vib/kong-ingress-controller/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/kong/vib-verify.json b/.vib/kong/vib-verify.json index 8ec095c9cb18..ccbff6771641 100644 --- a/.vib/kong/vib-verify.json +++ b/.vib/kong/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/ksql/vib-verify.json b/.vib/ksql/vib-verify.json index 83fc7e30c512..13ae61fdcc98 100644 --- a/.vib/ksql/vib-verify.json +++ b/.vib/ksql/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/kube-rbac-proxy/vib-verify.json b/.vib/kube-rbac-proxy/vib-verify.json index a34e8aee9161..82f78c1a2b77 100644 --- a/.vib/kube-rbac-proxy/vib-verify.json +++ b/.vib/kube-rbac-proxy/vib-verify.json @@ -16,7 +16,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/kube-state-metrics/vib-verify.json b/.vib/kube-state-metrics/vib-verify.json index 33ccd55110e2..e7d5656ef795 100644 --- a/.vib/kube-state-metrics/vib-verify.json +++ b/.vib/kube-state-metrics/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/kubeapps-apis/vib-verify.json b/.vib/kubeapps-apis/vib-verify.json index a3adf5dc8715..f78531b3587c 100644 --- a/.vib/kubeapps-apis/vib-verify.json +++ b/.vib/kubeapps-apis/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/kubeapps-apprepository-controller/vib-verify.json b/.vib/kubeapps-apprepository-controller/vib-verify.json index a34e8aee9161..82f78c1a2b77 100644 --- a/.vib/kubeapps-apprepository-controller/vib-verify.json +++ b/.vib/kubeapps-apprepository-controller/vib-verify.json @@ -16,7 +16,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/kubeapps-asset-syncer/vib-verify.json b/.vib/kubeapps-asset-syncer/vib-verify.json index a34e8aee9161..82f78c1a2b77 100644 --- a/.vib/kubeapps-asset-syncer/vib-verify.json +++ b/.vib/kubeapps-asset-syncer/vib-verify.json @@ -16,7 +16,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/kubeapps-dashboard/vib-verify.json b/.vib/kubeapps-dashboard/vib-verify.json index c656c97c07cf..9d786b79199c 100644 --- a/.vib/kubeapps-dashboard/vib-verify.json +++ b/.vib/kubeapps-dashboard/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/kubeapps-pinniped-proxy/vib-verify.json b/.vib/kubeapps-pinniped-proxy/vib-verify.json index 6eca18536722..b263e4459bea 100644 --- a/.vib/kubeapps-pinniped-proxy/vib-verify.json +++ b/.vib/kubeapps-pinniped-proxy/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/kubectl/vib-verify.json b/.vib/kubectl/vib-verify.json index 6a2d84251c75..247cd3d4bddd 100644 --- a/.vib/kubectl/vib-verify.json +++ b/.vib/kubectl/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/kubernetes-event-exporter/vib-verify.json b/.vib/kubernetes-event-exporter/vib-verify.json index dedbf5b0a924..e9de8cea59ef 100644 --- a/.vib/kubernetes-event-exporter/vib-verify.json +++ b/.vib/kubernetes-event-exporter/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/laravel/vib-verify.json b/.vib/laravel/vib-verify.json index fae16fbec83b..e4d2ed1cb349 100644 --- a/.vib/laravel/vib-verify.json +++ b/.vib/laravel/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/logstash/vib-verify.json b/.vib/logstash/vib-verify.json index 61df23156ac3..52f274db81ae 100644 --- a/.vib/logstash/vib-verify.json +++ b/.vib/logstash/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/magento/vib-verify.json b/.vib/magento/vib-verify.json index 73aca9c8009a..fee5ea1d9c6f 100644 --- a/.vib/magento/vib-verify.json +++ b/.vib/magento/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/mariadb-galera/10.3/vib-publish.json b/.vib/mariadb-galera/10.4/vib-verify.json similarity index 54% rename from .vib/mariadb-galera/10.3/vib-publish.json rename to .vib/mariadb-galera/10.4/vib-verify.json index 42b9a74f0d3b..ae2c09a885cb 100644 --- a/.vib/mariadb-galera/10.3/vib-publish.json +++ b/.vib/mariadb-galera/10.4/vib-verify.json @@ -1,7 +1,7 @@ { "context": { "resources": { - "url": "{VIB_ENV_CONTAINER_URL}", + "url": "{SHA_ARCHIVE}", "path": "{VIB_ENV_PATH}" }, "runtime_parameters": "Y29tbWFuZDogWyJ0YWlsIiwgIi1mIiwgIi9kZXYvbnVsbCJd" @@ -65,46 +65,6 @@ "OS" ] } - }, - { - "action_id": "osspi-application", - "params": { - "additional_packages_file": "osspi-packages-amd64.json", - "scan_type": "BASE_OS", - "osm": { - "associated_bossd_release": "{VIB_ENV_BOSSD_RELEASE_ID}", - "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" - }, - "resources": { - "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/{VIB_ENV_PATH}", - "authn": { - "header": "Authorization", - "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" - } - } - } - } - ] - }, - "publish": { - "actions": [ - { - "action_id": "container-image-publish", - "params": { - "metadata": { - "tags": {VIB_ENV_ROLLING_TAGS} - }, - "repository": { - "kind": "OCI", - "url": "{VIB_ENV_REGISTRY_URL}", - "authn": { - "username": "{VIB_ENV_REGISTRY_USERNAME}", - "password": "{VIB_ENV_REGISTRY_PASSWORD}" - } - } - } } ] } diff --git a/.vib/mariadb-galera/vib-verify.json b/.vib/mariadb-galera/vib-verify.json index f170e51fc87f..5c94f221cd62 100644 --- a/.vib/mariadb-galera/vib-verify.json +++ b/.vib/mariadb-galera/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/mariadb/10.3/vib-publish.json b/.vib/mariadb/10.4/vib-verify.json similarity index 53% rename from .vib/mariadb/10.3/vib-publish.json rename to .vib/mariadb/10.4/vib-verify.json index b830dcf4b171..b80deb740587 100644 --- a/.vib/mariadb/10.3/vib-publish.json +++ b/.vib/mariadb/10.4/vib-verify.json @@ -1,7 +1,7 @@ { "context": { "resources": { - "url": "{VIB_ENV_CONTAINER_URL}", + "url": "{SHA_ARCHIVE}", "path": "{VIB_ENV_PATH}" }, "runtime_parameters": "Y29tbWFuZDogWyJ0YWlsIiwgIi1mIiwgIi9kZXYvbnVsbCJd" @@ -65,46 +65,6 @@ "OS" ] } - }, - { - "action_id": "osspi-application", - "params": { - "additional_packages_file": "osspi-packages-amd64.json", - "scan_type": "BASE_OS", - "osm": { - "associated_bossd_release": "{VIB_ENV_BOSSD_RELEASE_ID}", - "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" - }, - "resources": { - "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/{VIB_ENV_PATH}", - "authn": { - "header": "Authorization", - "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" - } - } - } - } - ] - }, - "publish": { - "actions": [ - { - "action_id": "container-image-publish", - "params": { - "metadata": { - "tags": {VIB_ENV_ROLLING_TAGS} - }, - "repository": { - "kind": "OCI", - "url": "{VIB_ENV_REGISTRY_URL}", - "authn": { - "username": "{VIB_ENV_REGISTRY_USERNAME}", - "password": "{VIB_ENV_REGISTRY_PASSWORD}" - } - } - } } ] } diff --git a/.vib/mariadb/vib-verify.json b/.vib/mariadb/vib-verify.json index 62fc70a457f3..63a5644daf62 100644 --- a/.vib/mariadb/vib-verify.json +++ b/.vib/mariadb/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/mastodon/vib-verify.json b/.vib/mastodon/vib-verify.json index 55fa9289cfb8..411c1ba2f06a 100644 --- a/.vib/mastodon/vib-verify.json +++ b/.vib/mastodon/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/matomo/vib-verify.json b/.vib/matomo/vib-verify.json index c5eb10253fa2..71e21850b41c 100644 --- a/.vib/matomo/vib-verify.json +++ b/.vib/matomo/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/mediawiki/vib-verify.json b/.vib/mediawiki/vib-verify.json index 2dee01f4bc4a..5c82e8f4e5fb 100644 --- a/.vib/mediawiki/vib-verify.json +++ b/.vib/mediawiki/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/memcached-exporter/vib-verify.json b/.vib/memcached-exporter/vib-verify.json index 12c53741a0a7..830868d97da4 100644 --- a/.vib/memcached-exporter/vib-verify.json +++ b/.vib/memcached-exporter/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/memcached/vib-verify.json b/.vib/memcached/vib-verify.json index d9c4aa7f1c3c..269ce8eabe3f 100644 --- a/.vib/memcached/vib-verify.json +++ b/.vib/memcached/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/metallb-controller/vib-verify.json b/.vib/metallb-controller/vib-verify.json index cab381eb7e0b..276db1bd12f8 100644 --- a/.vib/metallb-controller/vib-verify.json +++ b/.vib/metallb-controller/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/metallb-speaker/vib-verify.json b/.vib/metallb-speaker/vib-verify.json index 0d80707b48fc..2ff149bd3501 100644 --- a/.vib/metallb-speaker/vib-verify.json +++ b/.vib/metallb-speaker/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/metrics-server/vib-verify.json b/.vib/metrics-server/vib-verify.json index 8052b350e76f..b0378c4856fe 100644 --- a/.vib/metrics-server/vib-verify.json +++ b/.vib/metrics-server/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/milvus/vib-verify.json b/.vib/milvus/vib-verify.json index 1f141513b0cf..5649e1b309d3 100644 --- a/.vib/milvus/vib-verify.json +++ b/.vib/milvus/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { @@ -49,14 +53,18 @@ "action_id": "trivy", "params": { "threshold": "CRITICAL", - "vuln_type": ["OS"] + "vuln_type": [ + "OS" + ] } }, { "action_id": "grype", "params": { "threshold": "CRITICAL", - "package_type": ["OS"] + "package_type": [ + "OS" + ] } } ] diff --git a/.vib/minio-client/vib-verify.json b/.vib/minio-client/vib-verify.json index 3bc925265e0d..e3018d256e4e 100644 --- a/.vib/minio-client/vib-verify.json +++ b/.vib/minio-client/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/minio/vib-verify.json b/.vib/minio/vib-verify.json index 127b9a578188..f7e33c7cfe7f 100644 --- a/.vib/minio/vib-verify.json +++ b/.vib/minio/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/mongodb-exporter/vib-verify.json b/.vib/mongodb-exporter/vib-verify.json index 5060e11b42fb..7b5c7b99add3 100644 --- a/.vib/mongodb-exporter/vib-verify.json +++ b/.vib/mongodb-exporter/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/mongodb-sharded/vib-verify.json b/.vib/mongodb-sharded/vib-verify.json index ac70ada48c98..0679f80f42de 100644 --- a/.vib/mongodb-sharded/vib-verify.json +++ b/.vib/mongodb-sharded/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/mongodb/vib-verify.json b/.vib/mongodb/vib-verify.json index 0eb393c1503c..f896e0e933ad 100644 --- a/.vib/mongodb/vib-verify.json +++ b/.vib/mongodb/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/moodle/vib-verify.json b/.vib/moodle/vib-verify.json index a0305f87c1d4..42d7b53902c3 100644 --- a/.vib/moodle/vib-verify.json +++ b/.vib/moodle/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/multus-cni/vib-verify.json b/.vib/multus-cni/vib-verify.json index 08103168bd79..14d6c7b689bc 100644 --- a/.vib/multus-cni/vib-verify.json +++ b/.vib/multus-cni/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/mxnet/vib-verify.json b/.vib/mxnet/vib-verify.json index 6e8e551c236c..04976254dd5b 100644 --- a/.vib/mxnet/vib-verify.json +++ b/.vib/mxnet/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/mysql/vib-verify.json b/.vib/mysql/vib-verify.json index 19fa588cb591..dd22df381ce2 100644 --- a/.vib/mysql/vib-verify.json +++ b/.vib/mysql/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/mysqld-exporter/vib-verify.json b/.vib/mysqld-exporter/vib-verify.json index 14a647ca9204..f8a74c206937 100644 --- a/.vib/mysqld-exporter/vib-verify.json +++ b/.vib/mysqld-exporter/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/nats-exporter/vib-verify.json b/.vib/nats-exporter/vib-verify.json index 6b78f0a5610f..ee481cb434e5 100644 --- a/.vib/nats-exporter/vib-verify.json +++ b/.vib/nats-exporter/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/nats/vib-verify.json b/.vib/nats/vib-verify.json index 4b221e985291..5fd721cfe7f8 100644 --- a/.vib/nats/vib-verify.json +++ b/.vib/nats/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/neo4j/vib-verify.json b/.vib/neo4j/vib-verify.json index d969f8a8d7da..8363b22b7b55 100644 --- a/.vib/neo4j/vib-verify.json +++ b/.vib/neo4j/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/nginx-exporter/vib-verify.json b/.vib/nginx-exporter/vib-verify.json index 10018f33db7e..c9389ce0a5cc 100644 --- a/.vib/nginx-exporter/vib-verify.json +++ b/.vib/nginx-exporter/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/nginx-ingress-controller/vib-verify.json b/.vib/nginx-ingress-controller/vib-verify.json index a12aee6cd0f5..6aabec3b4e69 100644 --- a/.vib/nginx-ingress-controller/vib-verify.json +++ b/.vib/nginx-ingress-controller/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/nginx/vib-verify.json b/.vib/nginx/vib-verify.json index 52037e24e008..2cbfa505448e 100644 --- a/.vib/nginx/vib-verify.json +++ b/.vib/nginx/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/node-exporter/vib-verify.json b/.vib/node-exporter/vib-verify.json index c5ce4d37298c..8ee230966658 100644 --- a/.vib/node-exporter/vib-verify.json +++ b/.vib/node-exporter/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/node/vib-verify.json b/.vib/node/vib-verify.json index f17e3469506b..0c8305ed23ac 100644 --- a/.vib/node/vib-verify.json +++ b/.vib/node/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/oauth2-proxy/vib-verify.json b/.vib/oauth2-proxy/vib-verify.json index 018322f2484a..b4c1bc193775 100644 --- a/.vib/oauth2-proxy/vib-verify.json +++ b/.vib/oauth2-proxy/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/odoo/14/vib-verify.json b/.vib/odoo/14/vib-verify.json new file mode 100644 index 000000000000..a631e349c5a1 --- /dev/null +++ b/.vib/odoo/14/vib-verify.json @@ -0,0 +1,72 @@ +{ + "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" + ] + } + }, + { + "action_id": "container-image-lint", + "params": { + "threshold": "error" + } + } + ] + }, + "verify": { + "actions": [ + { + "action_id": "goss", + "params": { + "resources": { + "path": "/.vib" + }, + "tests_file": "odoo/goss/goss.yaml", + "vars_file": "odoo/goss/vars.yaml", + "remote": { + "pod": { + "workload": "deploy-odoo" + } + } + } + }, + { + "action_id": "trivy", + "params": { + "threshold": "CRITICAL", + "vuln_type": [ + "OS" + ] + } + }, + { + "action_id": "grype", + "params": { + "threshold": "CRITICAL", + "package_type": [ + "OS" + ] + } + } + ] + } + } +} diff --git a/.vib/odoo/vib-verify.json b/.vib/odoo/vib-verify.json index 0a91097d4f14..16df1e7df1d4 100644 --- a/.vib/odoo/vib-verify.json +++ b/.vib/odoo/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/opencart/vib-verify.json b/.vib/opencart/vib-verify.json index 518ef236a297..945d637427ee 100644 --- a/.vib/opencart/vib-verify.json +++ b/.vib/opencart/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/openldap/vib-verify.json b/.vib/openldap/vib-verify.json index c90d04a01b43..f183ccefa280 100644 --- a/.vib/openldap/vib-verify.json +++ b/.vib/openldap/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/openresty/vib-verify.json b/.vib/openresty/vib-verify.json index 1b1c630c768c..b185122b3e33 100644 --- a/.vib/openresty/vib-verify.json +++ b/.vib/openresty/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/opensearch-dashboards/vib-verify.json b/.vib/opensearch-dashboards/vib-verify.json index befb3df8adea..3ca1e508095b 100644 --- a/.vib/opensearch-dashboards/vib-verify.json +++ b/.vib/opensearch-dashboards/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/opensearch/vib-verify.json b/.vib/opensearch/vib-verify.json index b8d9899bc812..8defa7fe9761 100644 --- a/.vib/opensearch/vib-verify.json +++ b/.vib/opensearch/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/oras/vib-verify.json b/.vib/oras/vib-verify.json index a34e8aee9161..82f78c1a2b77 100644 --- a/.vib/oras/vib-verify.json +++ b/.vib/oras/vib-verify.json @@ -16,7 +16,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/os-shell/vib-verify.json b/.vib/os-shell/vib-verify.json index 8a69ef93d9e1..06085e65ae48 100644 --- a/.vib/os-shell/vib-verify.json +++ b/.vib/os-shell/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/osclass/vib-verify.json b/.vib/osclass/vib-verify.json index 467386d0478f..f4dc6d5f5ffc 100644 --- a/.vib/osclass/vib-verify.json +++ b/.vib/osclass/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/parse-dashboard/vib-verify.json b/.vib/parse-dashboard/vib-verify.json index f6c55ad4b9a0..c89a249cc3c8 100644 --- a/.vib/parse-dashboard/vib-verify.json +++ b/.vib/parse-dashboard/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/parse/vib-verify.json b/.vib/parse/vib-verify.json index 05258b787d7c..f54372a0aad9 100644 --- a/.vib/parse/vib-verify.json +++ b/.vib/parse/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/percona-mysql/vib-verify.json b/.vib/percona-mysql/vib-verify.json index a3bbcd9dd251..3a6b24d7fa3f 100644 --- a/.vib/percona-mysql/vib-verify.json +++ b/.vib/percona-mysql/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/percona-xtrabackup/vib-verify.json b/.vib/percona-xtrabackup/vib-verify.json index ac2b01677e99..34c348b72c09 100644 --- a/.vib/percona-xtrabackup/vib-verify.json +++ b/.vib/percona-xtrabackup/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/pgbouncer/vib-verify.json b/.vib/pgbouncer/vib-verify.json index e5fc04e52931..1b235b5fa949 100644 --- a/.vib/pgbouncer/vib-verify.json +++ b/.vib/pgbouncer/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/pgpool/vib-verify.json b/.vib/pgpool/vib-verify.json index 3131919bb71f..ea66b0524bc2 100644 --- a/.vib/pgpool/vib-verify.json +++ b/.vib/pgpool/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/php-fpm/vib-verify.json b/.vib/php-fpm/vib-verify.json index 53246862d159..e4274b5f3e15 100644 --- a/.vib/php-fpm/vib-verify.json +++ b/.vib/php-fpm/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/phpbb/vib-verify.json b/.vib/phpbb/vib-verify.json index 43ba4d216505..1fe0eb4c2c15 100644 --- a/.vib/phpbb/vib-verify.json +++ b/.vib/phpbb/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/phpmyadmin/vib-verify.json b/.vib/phpmyadmin/vib-verify.json index da1b40f7af54..8dc913177ed1 100644 --- a/.vib/phpmyadmin/vib-verify.json +++ b/.vib/phpmyadmin/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/pinniped/vib-verify.json b/.vib/pinniped/vib-verify.json index a34e8aee9161..82f78c1a2b77 100644 --- a/.vib/pinniped/vib-verify.json +++ b/.vib/pinniped/vib-verify.json @@ -16,7 +16,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/postgres-exporter/vib-verify.json b/.vib/postgres-exporter/vib-verify.json index 88cea4179746..55e2d58165e8 100644 --- a/.vib/postgres-exporter/vib-verify.json +++ b/.vib/postgres-exporter/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/postgresql-repmgr/vib-verify.json b/.vib/postgresql-repmgr/vib-verify.json index e19adf652f12..3301ca02ea3e 100644 --- a/.vib/postgresql-repmgr/vib-verify.json +++ b/.vib/postgresql-repmgr/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/postgresql/vib-verify.json b/.vib/postgresql/vib-verify.json index d2d8328025e7..5910d47d6c4c 100644 --- a/.vib/postgresql/vib-verify.json +++ b/.vib/postgresql/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/postgrest/vib-verify.json b/.vib/postgrest/vib-verify.json index 875d7465b88e..f514350d9f96 100644 --- a/.vib/postgrest/vib-verify.json +++ b/.vib/postgrest/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/prestashop/vib-verify.json b/.vib/prestashop/vib-verify.json index 14593e1ed69d..be0c9052e59e 100644 --- a/.vib/prestashop/vib-verify.json +++ b/.vib/prestashop/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/prometheus-operator/vib-verify.json b/.vib/prometheus-operator/vib-verify.json index c79269ebfd47..2943bbc40f42 100644 --- a/.vib/prometheus-operator/vib-verify.json +++ b/.vib/prometheus-operator/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/prometheus-rsocket-proxy/vib-verify.json b/.vib/prometheus-rsocket-proxy/vib-verify.json index 0f8cdffe88ca..3a7ee59fd584 100644 --- a/.vib/prometheus-rsocket-proxy/vib-verify.json +++ b/.vib/prometheus-rsocket-proxy/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/prometheus/vib-verify.json b/.vib/prometheus/vib-verify.json index 9380bd1700bf..f2f8fdb22368 100644 --- a/.vib/prometheus/vib-verify.json +++ b/.vib/prometheus/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/promtail/vib-verify.json b/.vib/promtail/vib-verify.json index 657c25ad9c21..d4c0f231effc 100644 --- a/.vib/promtail/vib-verify.json +++ b/.vib/promtail/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/pushgateway/vib-verify.json b/.vib/pushgateway/vib-verify.json index c9f85145028b..4b6e32a2ba70 100644 --- a/.vib/pushgateway/vib-verify.json +++ b/.vib/pushgateway/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/pymilvus/vib-verify.json b/.vib/pymilvus/vib-verify.json index 4f19c15276fe..f9f98d6d2fe9 100644 --- a/.vib/pymilvus/vib-verify.json +++ b/.vib/pymilvus/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { @@ -49,14 +53,18 @@ "action_id": "trivy", "params": { "threshold": "CRITICAL", - "vuln_type": ["OS"] + "vuln_type": [ + "OS" + ] } }, { "action_id": "grype", "params": { "threshold": "CRITICAL", - "package_type": ["OS"] + "package_type": [ + "OS" + ] } } ] diff --git a/.vib/python/vib-verify.json b/.vib/python/vib-verify.json index ad5ad2edc6ac..2fadc2e7bf0c 100644 --- a/.vib/python/vib-verify.json +++ b/.vib/python/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/pytorch/vib-verify.json b/.vib/pytorch/vib-verify.json index 8a8cd3fab3fc..f8394db1646f 100644 --- a/.vib/pytorch/vib-verify.json +++ b/.vib/pytorch/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/rabbitmq-cluster-operator/vib-verify.json b/.vib/rabbitmq-cluster-operator/vib-verify.json index a34e8aee9161..82f78c1a2b77 100644 --- a/.vib/rabbitmq-cluster-operator/vib-verify.json +++ b/.vib/rabbitmq-cluster-operator/vib-verify.json @@ -16,7 +16,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/rabbitmq/vib-verify.json b/.vib/rabbitmq/vib-verify.json index c06993a7e51d..33bf530726f5 100644 --- a/.vib/rabbitmq/vib-verify.json +++ b/.vib/rabbitmq/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/rails/vib-verify.json b/.vib/rails/vib-verify.json index 9b5df06d1da5..ec23716ba804 100644 --- a/.vib/rails/vib-verify.json +++ b/.vib/rails/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/rclone/vib-verify.json b/.vib/rclone/vib-verify.json index d1d094933664..681680ca605d 100644 --- a/.vib/rclone/vib-verify.json +++ b/.vib/rclone/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/redis-cluster/vib-verify.json b/.vib/redis-cluster/vib-verify.json index 4f37b86474d6..a9c28d1c6bbf 100644 --- a/.vib/redis-cluster/vib-verify.json +++ b/.vib/redis-cluster/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/redis-exporter/vib-verify.json b/.vib/redis-exporter/vib-verify.json index c62b04fa0ed9..0c6172bbbf6b 100644 --- a/.vib/redis-exporter/vib-verify.json +++ b/.vib/redis-exporter/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/redis-sentinel/vib-verify.json b/.vib/redis-sentinel/vib-verify.json index e86224aaf62a..eaa52d03e5b2 100644 --- a/.vib/redis-sentinel/vib-verify.json +++ b/.vib/redis-sentinel/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/redis/vib-verify.json b/.vib/redis/vib-verify.json index 2e2a1520d4f6..26fabcf13645 100644 --- a/.vib/redis/vib-verify.json +++ b/.vib/redis/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/redmine/vib-verify.json b/.vib/redmine/vib-verify.json index b97561a97345..5286ef67e862 100644 --- a/.vib/redmine/vib-verify.json +++ b/.vib/redmine/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/reportserver/vib-verify.json b/.vib/reportserver/vib-verify.json index ad2541988511..9ed66de0f2dd 100644 --- a/.vib/reportserver/vib-verify.json +++ b/.vib/reportserver/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/rmq-default-credential-updater/vib-verify.json b/.vib/rmq-default-credential-updater/vib-verify.json index a34e8aee9161..82f78c1a2b77 100644 --- a/.vib/rmq-default-credential-updater/vib-verify.json +++ b/.vib/rmq-default-credential-updater/vib-verify.json @@ -16,7 +16,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/rmq-messaging-topology-operator/vib-verify.json b/.vib/rmq-messaging-topology-operator/vib-verify.json index a34e8aee9161..82f78c1a2b77 100644 --- a/.vib/rmq-messaging-topology-operator/vib-verify.json +++ b/.vib/rmq-messaging-topology-operator/vib-verify.json @@ -16,7 +16,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/ruby/vib-verify.json b/.vib/ruby/vib-verify.json index a24bd34ef426..c379a035eadf 100644 --- a/.vib/ruby/vib-verify.json +++ b/.vib/ruby/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/schema-registry/vib-verify.json b/.vib/schema-registry/vib-verify.json index 047ee1d2cb53..582a76516b25 100644 --- a/.vib/schema-registry/vib-verify.json +++ b/.vib/schema-registry/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/sealed-secrets/vib-verify.json b/.vib/sealed-secrets/vib-verify.json index a34e8aee9161..82f78c1a2b77 100644 --- a/.vib/sealed-secrets/vib-verify.json +++ b/.vib/sealed-secrets/vib-verify.json @@ -16,7 +16,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/solr/vib-verify.json b/.vib/solr/vib-verify.json index aab9cd85d68c..b801ec532a78 100644 --- a/.vib/solr/vib-verify.json +++ b/.vib/solr/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/sonarqube/vib-verify.json b/.vib/sonarqube/vib-verify.json index 3c6def2993a6..30de20376b9b 100644 --- a/.vib/sonarqube/vib-verify.json +++ b/.vib/sonarqube/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/spark/vib-verify.json b/.vib/spark/vib-verify.json index bf7a925ac432..a81f1f07566a 100644 --- a/.vib/spark/vib-verify.json +++ b/.vib/spark/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/spring-cloud-dataflow-composed-task-runner/vib-verify.json b/.vib/spring-cloud-dataflow-composed-task-runner/vib-verify.json index 58f726c9cb43..43dbdbbb7866 100644 --- a/.vib/spring-cloud-dataflow-composed-task-runner/vib-verify.json +++ b/.vib/spring-cloud-dataflow-composed-task-runner/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/spring-cloud-dataflow-shell/vib-verify.json b/.vib/spring-cloud-dataflow-shell/vib-verify.json index e21275bb8723..9f6e5cd3be7a 100644 --- a/.vib/spring-cloud-dataflow-shell/vib-verify.json +++ b/.vib/spring-cloud-dataflow-shell/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/spring-cloud-dataflow/vib-verify.json b/.vib/spring-cloud-dataflow/vib-verify.json index 45c48c89a7fe..b1d93476e5d9 100644 --- a/.vib/spring-cloud-dataflow/vib-verify.json +++ b/.vib/spring-cloud-dataflow/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/spring-cloud-skipper-shell/vib-verify.json b/.vib/spring-cloud-skipper-shell/vib-verify.json index 16d35a8d5f5a..2cd961175112 100644 --- a/.vib/spring-cloud-skipper-shell/vib-verify.json +++ b/.vib/spring-cloud-skipper-shell/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/spring-cloud-skipper/vib-verify.json b/.vib/spring-cloud-skipper/vib-verify.json index 4b6d39c23974..0f17efe37e53 100644 --- a/.vib/spring-cloud-skipper/vib-verify.json +++ b/.vib/spring-cloud-skipper/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/suitecrm/vib-verify.json b/.vib/suitecrm/vib-verify.json index 205f4604dca4..c249e6eb1d61 100644 --- a/.vib/suitecrm/vib-verify.json +++ b/.vib/suitecrm/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/supabase-postgres-meta/vib-verify.json b/.vib/supabase-postgres-meta/vib-verify.json index 449784b9665b..7ce5ad9d85b7 100644 --- a/.vib/supabase-postgres-meta/vib-verify.json +++ b/.vib/supabase-postgres-meta/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/supabase-postgres/vib-verify.json b/.vib/supabase-postgres/vib-verify.json index fbc713e1d4b0..ab862de0a348 100644 --- a/.vib/supabase-postgres/vib-verify.json +++ b/.vib/supabase-postgres/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/supabase-realtime/vib-verify.json b/.vib/supabase-realtime/vib-verify.json index 8a799191d122..00975aee04e1 100644 --- a/.vib/supabase-realtime/vib-verify.json +++ b/.vib/supabase-realtime/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/supabase-storage/vib-verify.json b/.vib/supabase-storage/vib-verify.json index 69a76488ed42..aece2d7cd01b 100644 --- a/.vib/supabase-storage/vib-verify.json +++ b/.vib/supabase-storage/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/supabase-studio/vib-verify.json b/.vib/supabase-studio/vib-verify.json index 0cc9bf1e7e05..a13867131535 100644 --- a/.vib/supabase-studio/vib-verify.json +++ b/.vib/supabase-studio/vib-verify.json @@ -17,7 +17,10 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64" + ] } }, { diff --git a/.vib/symfony/vib-verify.json b/.vib/symfony/vib-verify.json index d0f8e8606557..06c69d0c0b23 100644 --- a/.vib/symfony/vib-verify.json +++ b/.vib/symfony/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/telegraf/vib-verify.json b/.vib/telegraf/vib-verify.json index b31cffc678de..4e5a9c12d46c 100644 --- a/.vib/telegraf/vib-verify.json +++ b/.vib/telegraf/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/tensorflow-resnet/vib-verify.json b/.vib/tensorflow-resnet/vib-verify.json index 4f73baa45885..79ebf57f4a5c 100644 --- a/.vib/tensorflow-resnet/vib-verify.json +++ b/.vib/tensorflow-resnet/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/tensorflow-serving/vib-verify.json b/.vib/tensorflow-serving/vib-verify.json index 47decc471630..40d92d79c554 100644 --- a/.vib/tensorflow-serving/vib-verify.json +++ b/.vib/tensorflow-serving/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/thanos/vib-verify.json b/.vib/thanos/vib-verify.json index a34e8aee9161..82f78c1a2b77 100644 --- a/.vib/thanos/vib-verify.json +++ b/.vib/thanos/vib-verify.json @@ -16,7 +16,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/tomcat/vib-verify.json b/.vib/tomcat/vib-verify.json index fa272cd8d276..40cbedcc6fe1 100644 --- a/.vib/tomcat/vib-verify.json +++ b/.vib/tomcat/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/trivy/vib-verify.json b/.vib/trivy/vib-verify.json index 19d35906d7f3..d461f2db1932 100644 --- a/.vib/trivy/vib-verify.json +++ b/.vib/trivy/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/vault-csi-provider/vib-verify.json b/.vib/vault-csi-provider/vib-verify.json index a3bc2d2331ec..ae62a87b08a0 100644 --- a/.vib/vault-csi-provider/vib-verify.json +++ b/.vib/vault-csi-provider/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { @@ -66,4 +70,4 @@ ] } } -} \ No newline at end of file +} diff --git a/.vib/vault-k8s/vib-verify.json b/.vib/vault-k8s/vib-verify.json index 981469bc1271..edfd56f6814a 100644 --- a/.vib/vault-k8s/vib-verify.json +++ b/.vib/vault-k8s/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { @@ -66,4 +70,4 @@ ] } } -} \ No newline at end of file +} diff --git a/.vib/vault/vib-verify.json b/.vib/vault/vib-verify.json index 80d2806c1271..931bf86b291c 100644 --- a/.vib/vault/vib-verify.json +++ b/.vib/vault/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { @@ -66,4 +70,4 @@ ] } } -} \ No newline at end of file +} diff --git a/.vib/whereabouts/vib-verify.json b/.vib/whereabouts/vib-verify.json index 2c1ddcf397f0..338b6428a900 100644 --- a/.vib/whereabouts/vib-verify.json +++ b/.vib/whereabouts/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/wildfly/vib-verify.json b/.vib/wildfly/vib-verify.json index 08b14ca6c7f5..660c91653fc7 100644 --- a/.vib/wildfly/vib-verify.json +++ b/.vib/wildfly/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/wordpress-nginx/vib-verify.json b/.vib/wordpress-nginx/vib-verify.json index 851a343c21fb..48b947867468 100644 --- a/.vib/wordpress-nginx/vib-verify.json +++ b/.vib/wordpress-nginx/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/wordpress/vib-verify.json b/.vib/wordpress/vib-verify.json index aa9910507519..5666d621d120 100644 --- a/.vib/wordpress/vib-verify.json +++ b/.vib/wordpress/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, { diff --git a/.vib/zookeeper/vib-verify.json b/.vib/zookeeper/vib-verify.json index 4f55db94016a..b6e3eb3a2488 100644 --- a/.vib/zookeeper/vib-verify.json +++ b/.vib/zookeeper/vib-verify.json @@ -17,7 +17,11 @@ "name": "{VIB_ENV_CONTAINER}", "tag": "{VIB_ENV_TAG}" } - } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] } }, {