diff --git a/.github/workflows/cd-prepare.yml b/.github/workflows/cd-prepare.yml index 422a5a30ac88..8b3ffe52a9ed 100644 --- a/.github/workflows/cd-prepare.yml +++ b/.github/workflows/cd-prepare.yml @@ -71,8 +71,11 @@ jobs: if [[ -d ".vib/${dsl_path}/${branch}" ]]; then dsl_path="${dsl_path}/${branch}" fi - container_json=$(jq -n '{"name": $name, "path": $path, "os_flavour": $os_flavour, "branch": $branch, "app_version": $app_version, "revision": $revision, "sha": $sha, "sha_url": $sha_url, "dsl_path": $dsl_path, "tag": $tag, "rolling_tags": $rolling_tags}' \ - --arg name "$name" --arg path "$container" --arg os_flavour "$os_flavour" --arg branch "$branch" --arg app_version "$app_version" --arg revision "$revision" --arg sha "$SHA" --arg sha_url "$SHA_URL" --arg dsl_path "$dsl_path" --arg tag "$tag" --argjson rolling_tags "$rolling_tags") + # This is hack to avoid jq errors while getting the architectures + vib_publish="$(cat .vib/${dsl_path}/vib-publish.json | sed -e 's|{VIB_ENV_ROLLING_TAGS}|"${rolling_tags}"|')" + architectures="$(echo "${vib_publish}" | jq -cr '.phases.package.actions[] | select(.action_id == "container-image-package") | .params.architectures')" + container_json=$(jq -n '{"name": $name, "path": $path, "os_flavour": $os_flavour, "branch": $branch, "app_version": $app_version, "revision": $revision, "sha": $sha, "sha_url": $sha_url, "dsl_path": $dsl_path, "tag": $tag, "rolling_tags": $rolling_tags, "architectures": $architectures}' \ + --arg name "$name" --arg path "$container" --arg os_flavour "$os_flavour" --arg branch "$branch" --arg app_version "$app_version" --arg revision "$revision" --arg sha "$SHA" --arg sha_url "$SHA_URL" --arg dsl_path "$dsl_path" --arg tag "$tag" --argjson rolling_tags "$rolling_tags" --argjson architectures "$architectures") containers_json+=("${container_json}") fi fi @@ -98,7 +101,6 @@ jobs: run: | while read -r container; do # If it's set from outside, can be changed - arch="${arch:-amd64}" image_name=$(echo "$container" | jq -cr '.tag') image_path=$(echo "$container" | jq -cr '.path') version=$(echo "$container" | jq -cr '.app_version') @@ -110,53 +112,59 @@ jobs: # If the components.json file, so it seems has external packages if [[ -f "$components_json_file" ]]; then - declare -A packages=() - # Iterating over the external components to get the involved elements - while read -r component_id; do - if [[ -n "$component_id" ]]; then - component_version_full=$(jq -cr '."'${component_id}'".version' "$components_json_file") + while read -r architecture; do + # Remove platform prefix. + arch="${architecture##*/}" + declare -A packages=() + # Iterating over the external components to get the involved elements + while read -r component_id; do + if [[ -n "$component_id" ]]; then + component_version_full=$(jq -cr '."'${component_id}'".version' "$components_json_file") - #split by "-" - component_parts=(${component_version_full//-/ }) - component_version=${component_parts[0]} - component_distro=$(jq -cr '."'${component_id}'".distro' "$components_json_file") - component_arch=$(jq -cr '."'${component_id}'".arch' "$components_json_file") - # Added "true" to avoid errors if compilation_recipe doesn't exists - compilation_recipe=$(s3cmd ls -l "s3://${AWS_S3_BUCKET}/$component_id/$component_version/$component_distro/$component_arch/" | grep -c "compilation-recipe.json" || true) - # If the components.json file, so it seems has external packages - if [[ $compilation_recipe -gt 0 ]]; then - s3cmd get "s3://${AWS_S3_BUCKET}/$component_id/$component_version/$component_distro/$component_arch/compilation-recipe.json" compilation-recipe.json - else - s3cmd get "s3://${AWS_S3_BUCKET}/$component_id/$component_version-${component_parts[1]}/$component_distro/$component_arch/compilation-recipe.json" compilation-recipe.json + #split by "-" + component_parts=(${component_version_full//-/ }) + component_version=${component_parts[0]} + component_distro=$(jq -cr '."'${component_id}'".distro' "$components_json_file") + # We will use the container arch instead of the component arch (component file has only amd64 references) + # component_arch=$(jq -cr '."'${component_id}'".arch' "$components_json_file") + component_arch=$arch + # Added "true" to avoid errors if compilation_recipe doesn't exists + compilation_recipe=$(s3cmd ls -l "s3://${AWS_S3_BUCKET}/$component_id/$component_version/$component_distro/$component_arch/" | grep -c "compilation-recipe.json" || true) + # If the components.json file, so it seems has external packages + if [[ $compilation_recipe -gt 0 ]]; then + s3cmd get "s3://${AWS_S3_BUCKET}/$component_id/$component_version/$component_distro/$component_arch/compilation-recipe.json" compilation-recipe.json + else + s3cmd get "s3://${AWS_S3_BUCKET}/$component_id/$component_version-${component_parts[1]}/$component_distro/$component_arch/compilation-recipe.json" compilation-recipe.json + fi + # now getting each component to be reported + while read -r json_package; do + package_id=$(echo "$json_package" | jq -r '.id' ) + package_version=$(echo "$json_package" | jq -r '.version' ) + package_url=$(echo "$json_package" | jq -r '.source.upstreamSourceUrl') + packages[$package_id]="$package_version $package_url" + done <<<"$(jq -cr '.components[]' compilation-recipe.json)" + rm compilation-recipe.json fi - # now getting each component to be reported - while read -r json_package; do - package_id=$(echo "$json_package" | jq -r '.id' ) - package_version=$(echo "$json_package" | jq -r '.version' ) - package_url=$(echo "$json_package" | jq -r '.source.upstreamSourceUrl') - packages[$package_id]="$package_version $package_url" - done <<<"$(jq -cr '.components[]' compilation-recipe.json)" - rm compilation-recipe.json - fi - done <<<"$(jq -cr 'keys[]' "$components_json_file")" + done <<<"$(jq -cr 'keys[]' "$components_json_file")" - # Now creating the JSON file with the needed transformations - declare -a json_packages=() - for package_id in "${!packages[@]}" - do - values=(${packages[$package_id]// / }) - cleaned_url="${values[1]#git+}" - if [ -z "$cleaned_url" ] - then - echo "[WARNING] The URL for ${package_id}:${values[0]} is missing in the recipe" - else - json_packages+=($(jq -n '{"_unique_id": $uniqueID, "name": $name, "version": $version, "url": $url, "repository": "other"}' --arg uniqueID "other:$package_id:${values[0]}" --arg name "$package_id" --arg version "${values[0]}" --arg url "$cleaned_url")) - fi - done - JSON_ARRAY=$(printf "%s" "${json_packages[@]}" | jq -s) - echo "${JSON_ARRAY}" > "${image_path}/packages.json" - jq -n '{"packages": $packages, "server": { "scanner": "custom", "type": "Hub"}}' --argjson packages "$(cat ${image_path}/packages.json)" > "$image_path/osspi-packages.json" - s3cmd put "${image_path}/packages.json" "s3://${AWS_S3_BUCKET}/${asset}/${version}/${os_flavour}/${arch}/${revision}/packages.json" + # Now creating the JSON file with the needed transformations + declare -a json_packages=() + for package_id in "${!packages[@]}" + do + values=(${packages[$package_id]// / }) + cleaned_url="${values[1]#git+}" + if [ -z "$cleaned_url" ] + then + echo "[WARNING] The URL for ${package_id}:${values[0]} is missing in the recipe" + else + json_packages+=($(jq -n '{"_unique_id": $uniqueID, "name": $name, "version": $version, "url": $url, "repository": "other"}' --arg uniqueID "other:$package_id:${values[0]}" --arg name "$package_id" --arg version "${values[0]}" --arg url "$cleaned_url")) + fi + done + JSON_ARRAY=$(printf "%s" "${json_packages[@]}" | jq -s) + echo "${JSON_ARRAY}" > "${image_path}/packages-${arch}.json" + jq -n '{"packages": $packages, "server": { "scanner": "custom", "type": "Hub"}}' --argjson packages "$(cat ${image_path}/packages-${arch}.json)" > "$image_path/osspi-packages-${arch}.json" + s3cmd put "${image_path}/packages-${arch}.json" "s3://${AWS_S3_BUCKET}/${asset}/${version}/${os_flavour}/${arch}/${revision}/packages.json" + done <<<"$(echo $container | jq -cr '.architectures[]')" else echo "$image_name:$version doesn't have external components.json" fi @@ -170,4 +178,4 @@ jobs: if: ${{ steps.get-publish-metadata.outputs.result == 'ok' }} with: name: packages.json - path: ~/work/containers/**/osspi-packages.json \ No newline at end of file + path: ~/work/containers/**/osspi-packages*.json \ No newline at end of file diff --git a/.vib/acmesolver/vib-publish.json b/.vib/acmesolver/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/acmesolver/vib-publish.json +++ b/.vib/acmesolver/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/airflow-exporter/vib-publish.json b/.vib/airflow-exporter/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/airflow-exporter/vib-publish.json +++ b/.vib/airflow-exporter/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/airflow-scheduler/vib-publish.json b/.vib/airflow-scheduler/vib-publish.json index ed6604df1a2e..f78e8677530a 100644 --- a/.vib/airflow-scheduler/vib-publish.json +++ b/.vib/airflow-scheduler/vib-publish.json @@ -53,7 +53,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -61,7 +61,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/airflow-worker/vib-publish.json b/.vib/airflow-worker/vib-publish.json index ed6604df1a2e..f78e8677530a 100644 --- a/.vib/airflow-worker/vib-publish.json +++ b/.vib/airflow-worker/vib-publish.json @@ -53,7 +53,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -61,7 +61,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/airflow/vib-publish.json b/.vib/airflow/vib-publish.json index ed6604df1a2e..f78e8677530a 100644 --- a/.vib/airflow/vib-publish.json +++ b/.vib/airflow/vib-publish.json @@ -53,7 +53,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -61,7 +61,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/alertmanager/vib-publish.json b/.vib/alertmanager/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/alertmanager/vib-publish.json +++ b/.vib/alertmanager/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/apache-exporter/vib-publish.json b/.vib/apache-exporter/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/apache-exporter/vib-publish.json +++ b/.vib/apache-exporter/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/apache/vib-publish.json b/.vib/apache/vib-publish.json index 4d938d6d8c4d..ccb57fd59935 100644 --- a/.vib/apache/vib-publish.json +++ b/.vib/apache/vib-publish.json @@ -70,15 +70,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/appsmith/vib-publish.json b/.vib/appsmith/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/appsmith/vib-publish.json +++ b/.vib/appsmith/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/argo-cd/vib-publish.json b/.vib/argo-cd/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/argo-cd/vib-publish.json +++ b/.vib/argo-cd/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/argo-workflow-cli/vib-publish.json b/.vib/argo-workflow-cli/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/argo-workflow-cli/vib-publish.json +++ b/.vib/argo-workflow-cli/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/argo-workflow-controller/vib-publish.json b/.vib/argo-workflow-controller/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/argo-workflow-controller/vib-publish.json +++ b/.vib/argo-workflow-controller/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/argo-workflow-exec/vib-publish.json b/.vib/argo-workflow-exec/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/argo-workflow-exec/vib-publish.json +++ b/.vib/argo-workflow-exec/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/aspnet-core/vib-publish.json b/.vib/aspnet-core/vib-publish.json index b38815bbb2fd..a8712d6dd5f7 100644 --- a/.vib/aspnet-core/vib-publish.json +++ b/.vib/aspnet-core/vib-publish.json @@ -69,7 +69,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -77,7 +77,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/aws-cli/vib-publish.json b/.vib/aws-cli/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/aws-cli/vib-publish.json +++ b/.vib/aws-cli/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/azure-cli/vib-publish.json b/.vib/azure-cli/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/azure-cli/vib-publish.json +++ b/.vib/azure-cli/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/bitnami-shell/vib-publish.json b/.vib/bitnami-shell/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/bitnami-shell/vib-publish.json +++ b/.vib/bitnami-shell/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/blackbox-exporter/vib-publish.json b/.vib/blackbox-exporter/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/blackbox-exporter/vib-publish.json +++ b/.vib/blackbox-exporter/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/cainjector/vib-publish.json b/.vib/cainjector/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/cainjector/vib-publish.json +++ b/.vib/cainjector/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/cassandra-exporter/vib-publish.json b/.vib/cassandra-exporter/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/cassandra-exporter/vib-publish.json +++ b/.vib/cassandra-exporter/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/cassandra/vib-publish.json b/.vib/cassandra/vib-publish.json index f0274da78334..46bb1f56e54d 100644 --- a/.vib/cassandra/vib-publish.json +++ b/.vib/cassandra/vib-publish.json @@ -69,7 +69,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -77,7 +77,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/cert-manager-webhook/vib-publish.json b/.vib/cert-manager-webhook/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/cert-manager-webhook/vib-publish.json +++ b/.vib/cert-manager-webhook/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/cert-manager/vib-publish.json b/.vib/cert-manager/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/cert-manager/vib-publish.json +++ b/.vib/cert-manager/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/chartmuseum/vib-publish.json b/.vib/chartmuseum/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/chartmuseum/vib-publish.json +++ b/.vib/chartmuseum/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/clickhouse/vib-publish.json b/.vib/clickhouse/vib-publish.json index ed6604df1a2e..f78e8677530a 100644 --- a/.vib/clickhouse/vib-publish.json +++ b/.vib/clickhouse/vib-publish.json @@ -53,7 +53,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -61,7 +61,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/cluster-autoscaler/vib-publish.json b/.vib/cluster-autoscaler/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/cluster-autoscaler/vib-publish.json +++ b/.vib/cluster-autoscaler/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/codeigniter/vib-publish.json b/.vib/codeigniter/vib-publish.json index 8f8a7cc55f51..52786a66f38e 100644 --- a/.vib/codeigniter/vib-publish.json +++ b/.vib/codeigniter/vib-publish.json @@ -70,15 +70,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/concourse/vib-publish.json b/.vib/concourse/vib-publish.json index ed6604df1a2e..f78e8677530a 100644 --- a/.vib/concourse/vib-publish.json +++ b/.vib/concourse/vib-publish.json @@ -53,7 +53,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -61,7 +61,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/configmap-reload/vib-publish.json b/.vib/configmap-reload/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/configmap-reload/vib-publish.json +++ b/.vib/configmap-reload/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/configurable-http-proxy/vib-publish.json b/.vib/configurable-http-proxy/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/configurable-http-proxy/vib-publish.json +++ b/.vib/configurable-http-proxy/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/consul-exporter/vib-publish.json b/.vib/consul-exporter/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/consul-exporter/vib-publish.json +++ b/.vib/consul-exporter/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/consul/vib-publish.json b/.vib/consul/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/consul/vib-publish.json +++ b/.vib/consul/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/contour-operator/vib-publish.json b/.vib/contour-operator/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/contour-operator/vib-publish.json +++ b/.vib/contour-operator/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/contour/vib-publish.json b/.vib/contour/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/contour/vib-publish.json +++ b/.vib/contour/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/cosign/vib-publish.json b/.vib/cosign/vib-publish.json index fe7fab06ef24..d2181c4de204 100644 --- a/.vib/cosign/vib-publish.json +++ b/.vib/cosign/vib-publish.json @@ -70,15 +70,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/couchdb/vib-publish.json b/.vib/couchdb/vib-publish.json index 5544c4d38232..c1b71b4c5953 100644 --- a/.vib/couchdb/vib-publish.json +++ b/.vib/couchdb/vib-publish.json @@ -70,15 +70,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/dex/vib-publish.json b/.vib/dex/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/dex/vib-publish.json +++ b/.vib/dex/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/discourse/vib-publish.json b/.vib/discourse/vib-publish.json index ed6604df1a2e..f78e8677530a 100644 --- a/.vib/discourse/vib-publish.json +++ b/.vib/discourse/vib-publish.json @@ -53,7 +53,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -61,7 +61,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/dokuwiki/vib-publish.json b/.vib/dokuwiki/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/dokuwiki/vib-publish.json +++ b/.vib/dokuwiki/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/dotnet-sdk/vib-publish.json b/.vib/dotnet-sdk/vib-publish.json index 5105b88cc974..b034068a736e 100644 --- a/.vib/dotnet-sdk/vib-publish.json +++ b/.vib/dotnet-sdk/vib-publish.json @@ -69,7 +69,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -77,7 +77,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/dotnet/vib-publish.json b/.vib/dotnet/vib-publish.json index 6e38bd251c55..0e9aa0400417 100644 --- a/.vib/dotnet/vib-publish.json +++ b/.vib/dotnet/vib-publish.json @@ -69,7 +69,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -77,7 +77,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/drupal-nginx/vib-publish.json b/.vib/drupal-nginx/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/drupal-nginx/vib-publish.json +++ b/.vib/drupal-nginx/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/drupal/vib-publish.json b/.vib/drupal/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/drupal/vib-publish.json +++ b/.vib/drupal/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/ejbca/vib-publish.json b/.vib/ejbca/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/ejbca/vib-publish.json +++ b/.vib/ejbca/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/elasticsearch-exporter/vib-publish.json b/.vib/elasticsearch-exporter/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/elasticsearch-exporter/vib-publish.json +++ b/.vib/elasticsearch-exporter/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/elasticsearch/vib-publish.json b/.vib/elasticsearch/vib-publish.json index 190fdaf1ac95..54e98fa0a988 100644 --- a/.vib/elasticsearch/vib-publish.json +++ b/.vib/elasticsearch/vib-publish.json @@ -70,15 +70,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/envoy/1.20/vib-publish.json b/.vib/envoy/1.20/vib-publish.json index ed6604df1a2e..f78e8677530a 100644 --- a/.vib/envoy/1.20/vib-publish.json +++ b/.vib/envoy/1.20/vib-publish.json @@ -53,7 +53,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -61,7 +61,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/envoy/vib-publish.json b/.vib/envoy/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/envoy/vib-publish.json +++ b/.vib/envoy/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/etcd/vib-publish.json b/.vib/etcd/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/etcd/vib-publish.json +++ b/.vib/etcd/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/express/vib-publish.json b/.vib/express/vib-publish.json index e3dcc2d96f47..d488dc5616c6 100644 --- a/.vib/express/vib-publish.json +++ b/.vib/express/vib-publish.json @@ -70,15 +70,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/external-dns/vib-publish.json b/.vib/external-dns/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/external-dns/vib-publish.json +++ b/.vib/external-dns/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/flink/vib-publish.json b/.vib/flink/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/flink/vib-publish.json +++ b/.vib/flink/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/fluent-bit/vib-publish.json b/.vib/fluent-bit/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/fluent-bit/vib-publish.json +++ b/.vib/fluent-bit/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/fluentd/vib-publish.json b/.vib/fluentd/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/fluentd/vib-publish.json +++ b/.vib/fluentd/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/fluxcd-helm-controller/vib-publish.json b/.vib/fluxcd-helm-controller/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/fluxcd-helm-controller/vib-publish.json +++ b/.vib/fluxcd-helm-controller/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/fluxcd-image-automation-controller/vib-publish.json b/.vib/fluxcd-image-automation-controller/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/fluxcd-image-automation-controller/vib-publish.json +++ b/.vib/fluxcd-image-automation-controller/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/fluxcd-image-reflector-controller/vib-publish.json b/.vib/fluxcd-image-reflector-controller/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/fluxcd-image-reflector-controller/vib-publish.json +++ b/.vib/fluxcd-image-reflector-controller/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/fluxcd-kustomize-controller/vib-publish.json b/.vib/fluxcd-kustomize-controller/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/fluxcd-kustomize-controller/vib-publish.json +++ b/.vib/fluxcd-kustomize-controller/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/fluxcd-notification-controller/vib-publish.json b/.vib/fluxcd-notification-controller/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/fluxcd-notification-controller/vib-publish.json +++ b/.vib/fluxcd-notification-controller/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/fluxcd-source-controller/vib-publish.json b/.vib/fluxcd-source-controller/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/fluxcd-source-controller/vib-publish.json +++ b/.vib/fluxcd-source-controller/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/geode/vib-publish.json b/.vib/geode/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/geode/vib-publish.json +++ b/.vib/geode/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/ghost/vib-publish.json b/.vib/ghost/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/ghost/vib-publish.json +++ b/.vib/ghost/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/git/vib-publish.json b/.vib/git/vib-publish.json index 748b08bde5ea..e1beda546d3d 100644 --- a/.vib/git/vib-publish.json +++ b/.vib/git/vib-publish.json @@ -70,15 +70,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/gitea/vib-publish.json b/.vib/gitea/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/gitea/vib-publish.json +++ b/.vib/gitea/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/gitlab-runner-helper/vib-publish.json b/.vib/gitlab-runner-helper/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/gitlab-runner-helper/vib-publish.json +++ b/.vib/gitlab-runner-helper/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/gitlab-runner/vib-publish.json b/.vib/gitlab-runner/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/gitlab-runner/vib-publish.json +++ b/.vib/gitlab-runner/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/golang/vib-publish.json b/.vib/golang/vib-publish.json index 309a8054ac77..c6d585868410 100644 --- a/.vib/golang/vib-publish.json +++ b/.vib/golang/vib-publish.json @@ -70,15 +70,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/google-cloud-sdk/vib-publish.json b/.vib/google-cloud-sdk/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/google-cloud-sdk/vib-publish.json +++ b/.vib/google-cloud-sdk/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/gotrue/vib-publish.json b/.vib/gotrue/vib-publish.json index ed6604df1a2e..f78e8677530a 100644 --- a/.vib/gotrue/vib-publish.json +++ b/.vib/gotrue/vib-publish.json @@ -53,7 +53,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -61,7 +61,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/gradle/vib-publish.json b/.vib/gradle/vib-publish.json index 9a06ef42da94..c2ef1a1156cd 100644 --- a/.vib/gradle/vib-publish.json +++ b/.vib/gradle/vib-publish.json @@ -70,15 +70,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/grafana-image-renderer/vib-publish.json b/.vib/grafana-image-renderer/vib-publish.json index ed6604df1a2e..f78e8677530a 100644 --- a/.vib/grafana-image-renderer/vib-publish.json +++ b/.vib/grafana-image-renderer/vib-publish.json @@ -53,7 +53,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -61,7 +61,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/grafana-loki/vib-publish.json b/.vib/grafana-loki/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/grafana-loki/vib-publish.json +++ b/.vib/grafana-loki/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/grafana-mimir/vib-publish.json b/.vib/grafana-mimir/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/grafana-mimir/vib-publish.json +++ b/.vib/grafana-mimir/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/grafana-operator/vib-publish.json b/.vib/grafana-operator/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/grafana-operator/vib-publish.json +++ b/.vib/grafana-operator/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/grafana-tempo-query/vib-publish.json b/.vib/grafana-tempo-query/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/grafana-tempo-query/vib-publish.json +++ b/.vib/grafana-tempo-query/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/grafana-tempo-vulture/vib-publish.json b/.vib/grafana-tempo-vulture/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/grafana-tempo-vulture/vib-publish.json +++ b/.vib/grafana-tempo-vulture/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/grafana-tempo/vib-publish.json b/.vib/grafana-tempo/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/grafana-tempo/vib-publish.json +++ b/.vib/grafana-tempo/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/grafana/vib-publish.json b/.vib/grafana/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/grafana/vib-publish.json +++ b/.vib/grafana/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/haproxy/vib-publish.json b/.vib/haproxy/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/haproxy/vib-publish.json +++ b/.vib/haproxy/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/harbor-adapter-trivy/vib-publish.json b/.vib/harbor-adapter-trivy/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/harbor-adapter-trivy/vib-publish.json +++ b/.vib/harbor-adapter-trivy/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/harbor-core/vib-publish.json b/.vib/harbor-core/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/harbor-core/vib-publish.json +++ b/.vib/harbor-core/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/harbor-exporter/vib-publish.json b/.vib/harbor-exporter/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/harbor-exporter/vib-publish.json +++ b/.vib/harbor-exporter/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/harbor-jobservice/vib-publish.json b/.vib/harbor-jobservice/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/harbor-jobservice/vib-publish.json +++ b/.vib/harbor-jobservice/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/harbor-notary-server/vib-publish.json b/.vib/harbor-notary-server/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/harbor-notary-server/vib-publish.json +++ b/.vib/harbor-notary-server/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/harbor-notary-signer/vib-publish.json b/.vib/harbor-notary-signer/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/harbor-notary-signer/vib-publish.json +++ b/.vib/harbor-notary-signer/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/harbor-portal/vib-publish.json b/.vib/harbor-portal/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/harbor-portal/vib-publish.json +++ b/.vib/harbor-portal/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/harbor-registry/vib-publish.json b/.vib/harbor-registry/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/harbor-registry/vib-publish.json +++ b/.vib/harbor-registry/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/harbor-registryctl/vib-publish.json b/.vib/harbor-registryctl/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/harbor-registryctl/vib-publish.json +++ b/.vib/harbor-registryctl/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/influxdb/vib-publish.json b/.vib/influxdb/vib-publish.json index a265ed99280e..56f5b2a7e954 100644 --- a/.vib/influxdb/vib-publish.json +++ b/.vib/influxdb/vib-publish.json @@ -69,7 +69,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -77,7 +77,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/jaeger/vib-publish.json b/.vib/jaeger/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/jaeger/vib-publish.json +++ b/.vib/jaeger/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/jasperreports/vib-publish.json b/.vib/jasperreports/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/jasperreports/vib-publish.json +++ b/.vib/jasperreports/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/java/vib-publish.json b/.vib/java/vib-publish.json index 11ffddbc178c..8abd63289029 100644 --- a/.vib/java/vib-publish.json +++ b/.vib/java/vib-publish.json @@ -70,15 +70,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/jenkins-agent/vib-publish.json b/.vib/jenkins-agent/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/jenkins-agent/vib-publish.json +++ b/.vib/jenkins-agent/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/jenkins/vib-publish.json b/.vib/jenkins/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/jenkins/vib-publish.json +++ b/.vib/jenkins/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/jmx-exporter/vib-publish.json b/.vib/jmx-exporter/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/jmx-exporter/vib-publish.json +++ b/.vib/jmx-exporter/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/joomla/vib-publish.json b/.vib/joomla/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/joomla/vib-publish.json +++ b/.vib/joomla/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/jruby/vib-publish.json b/.vib/jruby/vib-publish.json index 0128f65bf4e5..3d06863f46f4 100644 --- a/.vib/jruby/vib-publish.json +++ b/.vib/jruby/vib-publish.json @@ -70,15 +70,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/jsonnet/vib-publish.json b/.vib/jsonnet/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/jsonnet/vib-publish.json +++ b/.vib/jsonnet/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/jupyter-base-notebook/vib-publish.json b/.vib/jupyter-base-notebook/vib-publish.json index ed6604df1a2e..f78e8677530a 100644 --- a/.vib/jupyter-base-notebook/vib-publish.json +++ b/.vib/jupyter-base-notebook/vib-publish.json @@ -53,7 +53,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -61,7 +61,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/jupyterhub/vib-publish.json b/.vib/jupyterhub/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/jupyterhub/vib-publish.json +++ b/.vib/jupyterhub/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/jwt-cli/vib-publish.json b/.vib/jwt-cli/vib-publish.json index ed6604df1a2e..f78e8677530a 100644 --- a/.vib/jwt-cli/vib-publish.json +++ b/.vib/jwt-cli/vib-publish.json @@ -53,7 +53,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -61,7 +61,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/kafka-exporter/vib-publish.json b/.vib/kafka-exporter/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/kafka-exporter/vib-publish.json +++ b/.vib/kafka-exporter/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/kafka/vib-publish.json b/.vib/kafka/vib-publish.json index 35e076533252..fde61099dc45 100644 --- a/.vib/kafka/vib-publish.json +++ b/.vib/kafka/vib-publish.json @@ -70,15 +70,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/kapacitor/vib-publish.json b/.vib/kapacitor/vib-publish.json index ed6604df1a2e..f78e8677530a 100644 --- a/.vib/kapacitor/vib-publish.json +++ b/.vib/kapacitor/vib-publish.json @@ -53,7 +53,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -61,7 +61,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/keycloak-config-cli/vib-publish.json b/.vib/keycloak-config-cli/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/keycloak-config-cli/vib-publish.json +++ b/.vib/keycloak-config-cli/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/keycloak/vib-publish.json b/.vib/keycloak/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/keycloak/vib-publish.json +++ b/.vib/keycloak/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/kiam/vib-publish.json b/.vib/kiam/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/kiam/vib-publish.json +++ b/.vib/kiam/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/kibana/vib-publish.json b/.vib/kibana/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/kibana/vib-publish.json +++ b/.vib/kibana/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/kong-ingress-controller/vib-publish.json b/.vib/kong-ingress-controller/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/kong-ingress-controller/vib-publish.json +++ b/.vib/kong-ingress-controller/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/kong/vib-publish.json b/.vib/kong/vib-publish.json index ed6604df1a2e..f78e8677530a 100644 --- a/.vib/kong/vib-publish.json +++ b/.vib/kong/vib-publish.json @@ -53,7 +53,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -61,7 +61,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/ksql/vib-publish.json b/.vib/ksql/vib-publish.json index aa35d4be2d80..ab62a1295ade 100644 --- a/.vib/ksql/vib-publish.json +++ b/.vib/ksql/vib-publish.json @@ -70,15 +70,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/kube-rbac-proxy/vib-publish.json b/.vib/kube-rbac-proxy/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/kube-rbac-proxy/vib-publish.json +++ b/.vib/kube-rbac-proxy/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/kube-state-metrics/vib-publish.json b/.vib/kube-state-metrics/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/kube-state-metrics/vib-publish.json +++ b/.vib/kube-state-metrics/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/kubeapps-apis/vib-publish.json b/.vib/kubeapps-apis/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/kubeapps-apis/vib-publish.json +++ b/.vib/kubeapps-apis/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/kubeapps-apprepository-controller/vib-publish.json b/.vib/kubeapps-apprepository-controller/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/kubeapps-apprepository-controller/vib-publish.json +++ b/.vib/kubeapps-apprepository-controller/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/kubeapps-asset-syncer/vib-publish.json b/.vib/kubeapps-asset-syncer/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/kubeapps-asset-syncer/vib-publish.json +++ b/.vib/kubeapps-asset-syncer/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/kubeapps-dashboard/vib-publish.json b/.vib/kubeapps-dashboard/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/kubeapps-dashboard/vib-publish.json +++ b/.vib/kubeapps-dashboard/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/kubeapps-kubeops/vib-publish.json b/.vib/kubeapps-kubeops/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/kubeapps-kubeops/vib-publish.json +++ b/.vib/kubeapps-kubeops/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/kubeapps-pinniped-proxy/vib-publish.json b/.vib/kubeapps-pinniped-proxy/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/kubeapps-pinniped-proxy/vib-publish.json +++ b/.vib/kubeapps-pinniped-proxy/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/kubectl/vib-publish.json b/.vib/kubectl/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/kubectl/vib-publish.json +++ b/.vib/kubectl/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/kubernetes-event-exporter/vib-publish.json b/.vib/kubernetes-event-exporter/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/kubernetes-event-exporter/vib-publish.json +++ b/.vib/kubernetes-event-exporter/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/laravel/vib-publish.json b/.vib/laravel/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/laravel/vib-publish.json +++ b/.vib/laravel/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/logstash/vib-publish.json b/.vib/logstash/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/logstash/vib-publish.json +++ b/.vib/logstash/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/magento/vib-publish.json b/.vib/magento/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/magento/vib-publish.json +++ b/.vib/magento/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/mariadb-galera/10.3/vib-publish.json b/.vib/mariadb-galera/10.3/vib-publish.json index 5abf6a613ad0..9737d7ad4e19 100644 --- a/.vib/mariadb-galera/10.3/vib-publish.json +++ b/.vib/mariadb-galera/10.3/vib-publish.json @@ -69,7 +69,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -77,7 +77,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/mariadb-galera/10.4/vib-publish.json b/.vib/mariadb-galera/10.4/vib-publish.json index 5abf6a613ad0..9737d7ad4e19 100644 --- a/.vib/mariadb-galera/10.4/vib-publish.json +++ b/.vib/mariadb-galera/10.4/vib-publish.json @@ -69,7 +69,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -77,7 +77,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/mariadb-galera/vib-publish.json b/.vib/mariadb-galera/vib-publish.json index 853016db103e..aac20704771c 100644 --- a/.vib/mariadb-galera/vib-publish.json +++ b/.vib/mariadb-galera/vib-publish.json @@ -70,15 +70,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/mariadb/10.3/vib-publish.json b/.vib/mariadb/10.3/vib-publish.json index 623f69d930b5..7736ae7be13b 100644 --- a/.vib/mariadb/10.3/vib-publish.json +++ b/.vib/mariadb/10.3/vib-publish.json @@ -69,7 +69,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -77,7 +77,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/mariadb/10.4/vib-publish.json b/.vib/mariadb/10.4/vib-publish.json index 623f69d930b5..7736ae7be13b 100644 --- a/.vib/mariadb/10.4/vib-publish.json +++ b/.vib/mariadb/10.4/vib-publish.json @@ -69,7 +69,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -77,7 +77,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/mariadb/vib-publish.json b/.vib/mariadb/vib-publish.json index 0ef9f37f1103..9ee977bcb642 100644 --- a/.vib/mariadb/vib-publish.json +++ b/.vib/mariadb/vib-publish.json @@ -70,15 +70,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/mastodon/vib-publish.json b/.vib/mastodon/vib-publish.json index ca7edd43546d..83cefee5fd66 100644 --- a/.vib/mastodon/vib-publish.json +++ b/.vib/mastodon/vib-publish.json @@ -50,7 +50,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -58,7 +58,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/matomo/vib-publish.json b/.vib/matomo/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/matomo/vib-publish.json +++ b/.vib/matomo/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/mediawiki/vib-publish.json b/.vib/mediawiki/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/mediawiki/vib-publish.json +++ b/.vib/mediawiki/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/memcached-exporter/vib-publish.json b/.vib/memcached-exporter/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/memcached-exporter/vib-publish.json +++ b/.vib/memcached-exporter/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/memcached/vib-publish.json b/.vib/memcached/vib-publish.json index ca2fe35fe69e..c25696402e8b 100644 --- a/.vib/memcached/vib-publish.json +++ b/.vib/memcached/vib-publish.json @@ -70,15 +70,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/metallb-controller/vib-publish.json b/.vib/metallb-controller/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/metallb-controller/vib-publish.json +++ b/.vib/metallb-controller/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/metallb-speaker/vib-publish.json b/.vib/metallb-speaker/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/metallb-speaker/vib-publish.json +++ b/.vib/metallb-speaker/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/metrics-server/vib-publish.json b/.vib/metrics-server/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/metrics-server/vib-publish.json +++ b/.vib/metrics-server/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/minio-client/vib-publish.json b/.vib/minio-client/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/minio-client/vib-publish.json +++ b/.vib/minio-client/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/minio/vib-publish.json b/.vib/minio/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/minio/vib-publish.json +++ b/.vib/minio/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/mongodb-exporter/vib-publish.json b/.vib/mongodb-exporter/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/mongodb-exporter/vib-publish.json +++ b/.vib/mongodb-exporter/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/mongodb-sharded/vib-publish.json b/.vib/mongodb-sharded/vib-publish.json index ed6604df1a2e..f78e8677530a 100644 --- a/.vib/mongodb-sharded/vib-publish.json +++ b/.vib/mongodb-sharded/vib-publish.json @@ -53,7 +53,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -61,7 +61,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/mongodb/vib-publish.json b/.vib/mongodb/vib-publish.json index 5c59601c311f..7898b3736db6 100644 --- a/.vib/mongodb/vib-publish.json +++ b/.vib/mongodb/vib-publish.json @@ -70,7 +70,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -78,7 +78,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/moodle/vib-publish.json b/.vib/moodle/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/moodle/vib-publish.json +++ b/.vib/moodle/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/multus-cni/vib-publish.json b/.vib/multus-cni/vib-publish.json index 37e32b0ed89a..d4fb58fb648c 100644 --- a/.vib/multus-cni/vib-publish.json +++ b/.vib/multus-cni/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/mxnet/vib-publish.json b/.vib/mxnet/vib-publish.json index ed6604df1a2e..f78e8677530a 100644 --- a/.vib/mxnet/vib-publish.json +++ b/.vib/mxnet/vib-publish.json @@ -53,7 +53,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -61,7 +61,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/mysql/vib-publish.json b/.vib/mysql/vib-publish.json index b8a089f193b2..b14eebe79850 100644 --- a/.vib/mysql/vib-publish.json +++ b/.vib/mysql/vib-publish.json @@ -70,15 +70,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/mysqld-exporter/vib-publish.json b/.vib/mysqld-exporter/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/mysqld-exporter/vib-publish.json +++ b/.vib/mysqld-exporter/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/nats-exporter/vib-publish.json b/.vib/nats-exporter/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/nats-exporter/vib-publish.json +++ b/.vib/nats-exporter/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/nats/vib-publish.json b/.vib/nats/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/nats/vib-publish.json +++ b/.vib/nats/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/neo4j/vib-publish.json b/.vib/neo4j/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/neo4j/vib-publish.json +++ b/.vib/neo4j/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/nginx-exporter/vib-publish.json b/.vib/nginx-exporter/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/nginx-exporter/vib-publish.json +++ b/.vib/nginx-exporter/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/nginx-ingress-controller/vib-publish.json b/.vib/nginx-ingress-controller/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/nginx-ingress-controller/vib-publish.json +++ b/.vib/nginx-ingress-controller/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/nginx/vib-publish.json b/.vib/nginx/vib-publish.json index 5a6d88329c8f..7322d9798bd4 100644 --- a/.vib/nginx/vib-publish.json +++ b/.vib/nginx/vib-publish.json @@ -70,15 +70,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/node-exporter/vib-publish.json b/.vib/node-exporter/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/node-exporter/vib-publish.json +++ b/.vib/node-exporter/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/node/vib-publish.json b/.vib/node/vib-publish.json index 6bb3f3fa4c99..283b24326e66 100644 --- a/.vib/node/vib-publish.json +++ b/.vib/node/vib-publish.json @@ -70,15 +70,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/oauth2-proxy/vib-publish.json b/.vib/oauth2-proxy/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/oauth2-proxy/vib-publish.json +++ b/.vib/oauth2-proxy/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/odoo/13/vib-publish.json b/.vib/odoo/13/vib-publish.json index ed6604df1a2e..f78e8677530a 100644 --- a/.vib/odoo/13/vib-publish.json +++ b/.vib/odoo/13/vib-publish.json @@ -53,7 +53,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -61,7 +61,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/odoo/14/vib-publish.json b/.vib/odoo/14/vib-publish.json index ed6604df1a2e..f78e8677530a 100644 --- a/.vib/odoo/14/vib-publish.json +++ b/.vib/odoo/14/vib-publish.json @@ -53,7 +53,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -61,7 +61,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/odoo/vib-publish.json b/.vib/odoo/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/odoo/vib-publish.json +++ b/.vib/odoo/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/opencart/vib-publish.json b/.vib/opencart/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/opencart/vib-publish.json +++ b/.vib/opencart/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/openldap/vib-publish.json b/.vib/openldap/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/openldap/vib-publish.json +++ b/.vib/openldap/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/openresty/vib-publish.json b/.vib/openresty/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/openresty/vib-publish.json +++ b/.vib/openresty/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/oras/vib-publish.json b/.vib/oras/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/oras/vib-publish.json +++ b/.vib/oras/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/osclass/vib-publish.json b/.vib/osclass/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/osclass/vib-publish.json +++ b/.vib/osclass/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/parse-dashboard/vib-publish.json b/.vib/parse-dashboard/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/parse-dashboard/vib-publish.json +++ b/.vib/parse-dashboard/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/parse/4/vib-publish.json b/.vib/parse/4/vib-publish.json index ed6604df1a2e..f78e8677530a 100644 --- a/.vib/parse/4/vib-publish.json +++ b/.vib/parse/4/vib-publish.json @@ -53,7 +53,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -61,7 +61,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/parse/vib-publish.json b/.vib/parse/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/parse/vib-publish.json +++ b/.vib/parse/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/percona-mysql/vib-publish.json b/.vib/percona-mysql/vib-publish.json index ed6604df1a2e..f78e8677530a 100644 --- a/.vib/percona-mysql/vib-publish.json +++ b/.vib/percona-mysql/vib-publish.json @@ -53,7 +53,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -61,7 +61,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/percona-xtrabackup/vib-publish.json b/.vib/percona-xtrabackup/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/percona-xtrabackup/vib-publish.json +++ b/.vib/percona-xtrabackup/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/pgbouncer/vib-publish.json b/.vib/pgbouncer/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/pgbouncer/vib-publish.json +++ b/.vib/pgbouncer/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/pgpool/vib-publish.json b/.vib/pgpool/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/pgpool/vib-publish.json +++ b/.vib/pgpool/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/php-fpm/vib-publish.json b/.vib/php-fpm/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/php-fpm/vib-publish.json +++ b/.vib/php-fpm/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/phpbb/vib-publish.json b/.vib/phpbb/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/phpbb/vib-publish.json +++ b/.vib/phpbb/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/phpmyadmin/vib-publish.json b/.vib/phpmyadmin/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/phpmyadmin/vib-publish.json +++ b/.vib/phpmyadmin/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/pinniped/vib-publish.json b/.vib/pinniped/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/pinniped/vib-publish.json +++ b/.vib/pinniped/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/postgres-exporter/vib-publish.json b/.vib/postgres-exporter/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/postgres-exporter/vib-publish.json +++ b/.vib/postgres-exporter/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/postgresql-repmgr/vib-publish.json b/.vib/postgresql-repmgr/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/postgresql-repmgr/vib-publish.json +++ b/.vib/postgresql-repmgr/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/postgresql/vib-publish.json b/.vib/postgresql/vib-publish.json index 1952c392a193..d08d8963b775 100644 --- a/.vib/postgresql/vib-publish.json +++ b/.vib/postgresql/vib-publish.json @@ -70,15 +70,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/postgrest/vib-publish.json b/.vib/postgrest/vib-publish.json index ef890ee11508..51403080b078 100644 --- a/.vib/postgrest/vib-publish.json +++ b/.vib/postgrest/vib-publish.json @@ -69,7 +69,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -77,7 +77,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/prestashop/vib-publish.json b/.vib/prestashop/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/prestashop/vib-publish.json +++ b/.vib/prestashop/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/prometheus-operator/vib-publish.json b/.vib/prometheus-operator/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/prometheus-operator/vib-publish.json +++ b/.vib/prometheus-operator/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/prometheus-rsocket-proxy/vib-publish.json b/.vib/prometheus-rsocket-proxy/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/prometheus-rsocket-proxy/vib-publish.json +++ b/.vib/prometheus-rsocket-proxy/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/prometheus/vib-publish.json b/.vib/prometheus/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/prometheus/vib-publish.json +++ b/.vib/prometheus/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/promtail/vib-publish.json b/.vib/promtail/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/promtail/vib-publish.json +++ b/.vib/promtail/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/pushgateway/vib-publish.json b/.vib/pushgateway/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/pushgateway/vib-publish.json +++ b/.vib/pushgateway/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/python/vib-publish.json b/.vib/python/vib-publish.json index c47dbc966091..212dd32e53b7 100644 --- a/.vib/python/vib-publish.json +++ b/.vib/python/vib-publish.json @@ -70,15 +70,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/pytorch/vib-publish.json b/.vib/pytorch/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/pytorch/vib-publish.json +++ b/.vib/pytorch/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/rabbitmq-cluster-operator/vib-publish.json b/.vib/rabbitmq-cluster-operator/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/rabbitmq-cluster-operator/vib-publish.json +++ b/.vib/rabbitmq-cluster-operator/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/rabbitmq/3.9/vib-publish.json b/.vib/rabbitmq/3.9/vib-publish.json index ed6604df1a2e..f78e8677530a 100644 --- a/.vib/rabbitmq/3.9/vib-publish.json +++ b/.vib/rabbitmq/3.9/vib-publish.json @@ -53,7 +53,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -61,7 +61,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/rabbitmq/vib-publish.json b/.vib/rabbitmq/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/rabbitmq/vib-publish.json +++ b/.vib/rabbitmq/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/rails/vib-publish.json b/.vib/rails/vib-publish.json index 34a929c137eb..523cac85dc6f 100644 --- a/.vib/rails/vib-publish.json +++ b/.vib/rails/vib-publish.json @@ -70,15 +70,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/rclone/vib-publish.json b/.vib/rclone/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/rclone/vib-publish.json +++ b/.vib/rclone/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/redis-cluster/vib-publish.json b/.vib/redis-cluster/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/redis-cluster/vib-publish.json +++ b/.vib/redis-cluster/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/redis-exporter/vib-publish.json b/.vib/redis-exporter/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/redis-exporter/vib-publish.json +++ b/.vib/redis-exporter/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/redis-sentinel/vib-publish.json b/.vib/redis-sentinel/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/redis-sentinel/vib-publish.json +++ b/.vib/redis-sentinel/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/redis/vib-publish.json b/.vib/redis/vib-publish.json index f4ee9b9aafb6..80bc31c2d77b 100644 --- a/.vib/redis/vib-publish.json +++ b/.vib/redis/vib-publish.json @@ -70,15 +70,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/redmine/vib-publish.json b/.vib/redmine/vib-publish.json index ed6604df1a2e..f78e8677530a 100644 --- a/.vib/redmine/vib-publish.json +++ b/.vib/redmine/vib-publish.json @@ -53,7 +53,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -61,7 +61,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/reportserver/vib-publish.json b/.vib/reportserver/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/reportserver/vib-publish.json +++ b/.vib/reportserver/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/rmq-default-credential-updater/vib-publish.json b/.vib/rmq-default-credential-updater/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/rmq-default-credential-updater/vib-publish.json +++ b/.vib/rmq-default-credential-updater/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/rmq-messaging-topology-operator/vib-publish.json b/.vib/rmq-messaging-topology-operator/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/rmq-messaging-topology-operator/vib-publish.json +++ b/.vib/rmq-messaging-topology-operator/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/ruby/vib-publish.json b/.vib/ruby/vib-publish.json index da30f0763a53..1972c398c34f 100644 --- a/.vib/ruby/vib-publish.json +++ b/.vib/ruby/vib-publish.json @@ -70,15 +70,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/schema-registry/vib-publish.json b/.vib/schema-registry/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/schema-registry/vib-publish.json +++ b/.vib/schema-registry/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/sealed-secrets/vib-publish.json b/.vib/sealed-secrets/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/sealed-secrets/vib-publish.json +++ b/.vib/sealed-secrets/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/solr/vib-publish.json b/.vib/solr/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/solr/vib-publish.json +++ b/.vib/solr/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/sonarqube/vib-publish.json b/.vib/sonarqube/vib-publish.json index ed6604df1a2e..f78e8677530a 100644 --- a/.vib/sonarqube/vib-publish.json +++ b/.vib/sonarqube/vib-publish.json @@ -53,7 +53,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -61,7 +61,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/spark/vib-publish.json b/.vib/spark/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/spark/vib-publish.json +++ b/.vib/spark/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/spring-cloud-dataflow-composed-task-runner/vib-publish.json b/.vib/spring-cloud-dataflow-composed-task-runner/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/spring-cloud-dataflow-composed-task-runner/vib-publish.json +++ b/.vib/spring-cloud-dataflow-composed-task-runner/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/spring-cloud-dataflow-shell/vib-publish.json b/.vib/spring-cloud-dataflow-shell/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/spring-cloud-dataflow-shell/vib-publish.json +++ b/.vib/spring-cloud-dataflow-shell/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/spring-cloud-dataflow/vib-publish.json b/.vib/spring-cloud-dataflow/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/spring-cloud-dataflow/vib-publish.json +++ b/.vib/spring-cloud-dataflow/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/spring-cloud-skipper-shell/vib-publish.json b/.vib/spring-cloud-skipper-shell/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/spring-cloud-skipper-shell/vib-publish.json +++ b/.vib/spring-cloud-skipper-shell/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/spring-cloud-skipper/vib-publish.json b/.vib/spring-cloud-skipper/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/spring-cloud-skipper/vib-publish.json +++ b/.vib/spring-cloud-skipper/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/suitecrm/vib-publish.json b/.vib/suitecrm/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/suitecrm/vib-publish.json +++ b/.vib/suitecrm/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/supabase-postgres-meta/vib-publish.json b/.vib/supabase-postgres-meta/vib-publish.json index ed6604df1a2e..f78e8677530a 100644 --- a/.vib/supabase-postgres-meta/vib-publish.json +++ b/.vib/supabase-postgres-meta/vib-publish.json @@ -53,7 +53,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -61,7 +61,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/supabase-postgres/vib-publish.json b/.vib/supabase-postgres/vib-publish.json index ed6604df1a2e..f78e8677530a 100644 --- a/.vib/supabase-postgres/vib-publish.json +++ b/.vib/supabase-postgres/vib-publish.json @@ -53,7 +53,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -61,7 +61,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/supabase-realtime/vib-publish.json b/.vib/supabase-realtime/vib-publish.json index ed6604df1a2e..f78e8677530a 100644 --- a/.vib/supabase-realtime/vib-publish.json +++ b/.vib/supabase-realtime/vib-publish.json @@ -53,7 +53,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -61,7 +61,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/supabase-storage/vib-publish.json b/.vib/supabase-storage/vib-publish.json index ed6604df1a2e..f78e8677530a 100644 --- a/.vib/supabase-storage/vib-publish.json +++ b/.vib/supabase-storage/vib-publish.json @@ -53,7 +53,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -61,7 +61,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/supabase-studio/vib-publish.json b/.vib/supabase-studio/vib-publish.json index ed6604df1a2e..f78e8677530a 100644 --- a/.vib/supabase-studio/vib-publish.json +++ b/.vib/supabase-studio/vib-publish.json @@ -53,7 +53,7 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", @@ -61,7 +61,7 @@ }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/symfony/vib-publish.json b/.vib/symfony/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/symfony/vib-publish.json +++ b/.vib/symfony/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/telegraf/vib-publish.json b/.vib/telegraf/vib-publish.json index ad358c3a3f5d..43e3ffb92888 100644 --- a/.vib/telegraf/vib-publish.json +++ b/.vib/telegraf/vib-publish.json @@ -70,15 +70,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/tensorflow-resnet/vib-publish.json b/.vib/tensorflow-resnet/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/tensorflow-resnet/vib-publish.json +++ b/.vib/tensorflow-resnet/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/tensorflow-serving/vib-publish.json b/.vib/tensorflow-serving/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/tensorflow-serving/vib-publish.json +++ b/.vib/tensorflow-serving/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/thanos/vib-publish.json b/.vib/thanos/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/thanos/vib-publish.json +++ b/.vib/thanos/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/tomcat/vib-publish.json b/.vib/tomcat/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/tomcat/vib-publish.json +++ b/.vib/tomcat/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/trivy/vib-publish.json b/.vib/trivy/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/trivy/vib-publish.json +++ b/.vib/trivy/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/wavefront-hpa-adapter/vib-publish.json b/.vib/wavefront-hpa-adapter/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/wavefront-hpa-adapter/vib-publish.json +++ b/.vib/wavefront-hpa-adapter/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/wavefront-kubernetes-collector/vib-publish.json b/.vib/wavefront-kubernetes-collector/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/wavefront-kubernetes-collector/vib-publish.json +++ b/.vib/wavefront-kubernetes-collector/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/wavefront-prometheus-storage-adapter/vib-publish.json b/.vib/wavefront-prometheus-storage-adapter/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/wavefront-prometheus-storage-adapter/vib-publish.json +++ b/.vib/wavefront-prometheus-storage-adapter/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/wavefront-proxy/vib-publish.json b/.vib/wavefront-proxy/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/wavefront-proxy/vib-publish.json +++ b/.vib/wavefront-proxy/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/whereabouts/vib-publish.json b/.vib/whereabouts/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/whereabouts/vib-publish.json +++ b/.vib/whereabouts/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/wildfly/vib-publish.json b/.vib/wildfly/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/wildfly/vib-publish.json +++ b/.vib/wildfly/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/wordpress-nginx/vib-publish.json b/.vib/wordpress-nginx/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/wordpress-nginx/vib-publish.json +++ b/.vib/wordpress-nginx/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/wordpress/vib-publish.json b/.vib/wordpress/vib-publish.json index 60864af4de22..68bda5e3614a 100644 --- a/.vib/wordpress/vib-publish.json +++ b/.vib/wordpress/vib-publish.json @@ -70,15 +70,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" diff --git a/.vib/zookeeper/vib-publish.json b/.vib/zookeeper/vib-publish.json index a484d2fc349a..fdedec57153e 100644 --- a/.vib/zookeeper/vib-publish.json +++ b/.vib/zookeeper/vib-publish.json @@ -54,15 +54,27 @@ { "action_id": "osspi-application", "params": { - "additional_packages_file": "{VIB_ENV_PATH}/osspi-packages.json", + "additional_packages_file": "osspi-packages-amd64.json", "scan_type": "BASE_OS", "osm": { "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container" + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "architecture_overrides": [ + { + "architecture": "linux/amd64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", + "additional_packages_file": "osspi-packages-amd64.json" + }, + { + "architecture": "linux/arm64", + "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", + "additional_packages_file": "osspi-packages-arm64.json" + } + ] }, "resources": { "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/", + "path": "/{VIB_ENV_PATH}", "authn": { "header": "Authorization", "token": "Bearer {VIB_ENV_GITHUB_TOKEN}"