From eb2c3dd085893ca8f3078f4967ed46b5a4ccfdb4 Mon Sep 17 00:00:00 2001 From: Fran Mulero Date: Tue, 7 Feb 2023 17:58:09 +0100 Subject: [PATCH] [bitnami/containers] Fix cd-workflow for scratch containers (#23164) Fix cd-workflow for scratch containers Signed-off-by: Fran Mulero --- .github/workflows/cd-prepare.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd-prepare.yml b/.github/workflows/cd-prepare.yml index bf300abe815f..407e14f41a54 100644 --- a/.github/workflows/cd-prepare.yml +++ b/.github/workflows/cd-prepare.yml @@ -62,7 +62,8 @@ jobs: else name="$(grep -oE "org.opencontainers.image.title=\".+\"" "${container}/Dockerfile" | sed -nr "s|org.opencontainers.image.title=\"(.+)\"|\1|p")" app_version="$(grep -oE "org.opencontainers.image.version=\".+\"" "${container}/Dockerfile" | sed -nr "s|org.opencontainers.image.version=\"(.+)\"|\1|p")" - os_flavour="$(grep -oP "OS_FLAVOUR=\"\K[^\"]+" "${container}/Dockerfile")" + os_flavour_parsed="$(grep -oP "OS_FLAVOUR=\"\K[^\"]+" "${container}/Dockerfile" || true)" + os_flavour=${os_flavour_parsed:-scratch} revision="${tag#"${app_version}-${os_flavour}-r"}" rolling_tags="$(yq '.rolling-tags' "${container}/tags-info.yaml" -o json | jq -c)" branch="$(echo "${container}" | awk -F '/' '{print $3}')" @@ -167,4 +168,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