diff --git a/.github/scripts/copy-images.sh b/.github/scripts/copy-images.sh index bb3a2240e..ef8d7d037 100755 --- a/.github/scripts/copy-images.sh +++ b/.github/scripts/copy-images.sh @@ -46,12 +46,12 @@ TARGET_NAP_WAFV5_IMAGE_PREFIX=${TARGET_NAP_WAFV5_IMAGE_PREFIX:-"nginx-ic-nap-v5/ TARGET_NAP_DOS_IMAGE_PREFIX=${TARGET_NAP_DOS_IMAGE_PREFIX:-"nginx-ic-dos/nginx-plus-ingress"} TARGET_NAP_WAF_DOS_IMAGE_PREFIX=${TARGET_NAP_WAF_DOS_IMAGE_PREFIX:-"nginx-ic-dos-nap/nginx-plus-ingress"} -declare -a OSS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine") -declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-alpine-fips") -declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-alpine-fips") -declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-ubi" "-alpine-fips") -declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi") -declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi") +declare -a OSS_TAG_POSTFIX_LIST=("" "-alpine") +declare -a PLUS_TAG_POSTFIX_LIST=("" "-alpine" "-alpine-fips") +declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-alpine-fips") +declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-alpine-fips") +declare -a NAP_DOS_TAG_POSTFIX_LIST=("") +declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("") CONFIG_PATH=${CONFIG_PATH:-~/.nic-release/config} if [ -f "$CONFIG_PATH" ]; then diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0e87afaea..d17617d5a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -294,14 +294,14 @@ jobs: with: ref: ${{ inputs.release_branch }} - - name: Certify UBI OSS images in quay - uses: ./.github/actions/certify-openshift-image - continue-on-error: true - with: - image: quay.io/nginx/nginx-ingress:${{ inputs.nic_version }}-ubi - project_id: ${{ secrets.CERTIFICATION_PROJECT_ID }} - pyxis_token: ${{ secrets.PYXIS_API_TOKEN }} - preflight_version: 1.11.1 + # - name: Certify UBI OSS images in quay + # uses: ./.github/actions/certify-openshift-image + # continue-on-error: true + # with: + # image: quay.io/nginx/nginx-ingress:${{ inputs.nic_version }}-ubi + # project_id: ${{ secrets.CERTIFICATION_PROJECT_ID }} + # pyxis_token: ${{ secrets.PYXIS_API_TOKEN }} + # preflight_version: 1.11.1 operator: if: ${{ ! cancelled() && ! failure() && ! inputs.dry_run && ! contains(inputs.skip_step, 'operator') && !contains(inputs.skip_step, 'publish-helm-chart') }} @@ -621,7 +621,7 @@ jobs: strategy: fail-fast: false matrix: - image: ["nginx/nginx-ingress:${{ inputs.nic_version }}", "nginx/nginx-ingress:${{ inputs.nic_version }}-ubi", "nginx/nginx-ingress:${{ inputs.nic_version }}-alpine"] + image: ["nginx/nginx-ingress:${{ inputs.nic_version }}", "nginx/nginx-ingress:${{ inputs.nic_version }}-alpine"] steps: - name: Checkout Repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/.github/workflows/update-docker-images.yml b/.github/workflows/update-docker-images.yml index fe65c8267..4aa4a6e18 100644 --- a/.github/workflows/update-docker-images.yml +++ b/.github/workflows/update-docker-images.yml @@ -177,12 +177,12 @@ jobs: - name: Checkout Repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - name: Certify UBI OSS images in quay - uses: ./.github/actions/certify-openshift-image - with: - image: quay.io/nginx/nginx-ingress:${{ needs.variables.outputs.tag }}-ubi - project_id: ${{ secrets.CERTIFICATION_PROJECT_ID }} - pyxis_token: ${{ secrets.PYXIS_API_TOKEN }} - platforms: "" - preflight_version: 1.11.1 - submit: ${{ ! inputs.dry_run || true }} + # - name: Certify UBI OSS images in quay + # uses: ./.github/actions/certify-openshift-image + # with: + # image: quay.io/nginx/nginx-ingress:${{ needs.variables.outputs.tag }}-ubi + # project_id: ${{ secrets.CERTIFICATION_PROJECT_ID }} + # pyxis_token: ${{ secrets.PYXIS_API_TOKEN }} + # platforms: "" + # preflight_version: 1.11.1 + # submit: ${{ ! inputs.dry_run || true }}