Skip to content

Commit

Permalink
Merge branch 'main' into revert-12340-fix-builder
Browse files Browse the repository at this point in the history
  • Loading branch information
KacperMalachowski committed Nov 14, 2024
2 parents 9fb7f2d + 33f54a9 commit 9fc4c4c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/actions/image-builder/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ runs:
id: prepare-tags
shell: bash
- uses: docker://europe-docker.pkg.dev/kyma-project/prod/image-builder:v20241112-fd0d9381
- uses: docker://europe-docker.pkg.dev/kyma-project/prod/image-builder:v20241114-555ad37c
id: build
with:
args: --name=${{ inputs.image-name }} --context=${{ inputs.context }} --dockerfile=${{ inputs.dockerfile }} --azure-access-token=${{ inputs.ado-token }} --oidc-token=${{ inputs.oidc-token }} ${{ steps.prepare-build-args.outputs.build-args }} ${{ steps.prepare-tags.outputs.tags }} --export-tags=${{ inputs.export-tags }} --config=${{ inputs.config }} --env-file=${{ inputs.env-file }} --build-in-ado=true --use-go-internal-sap-modules=${{ inputs.use-go-internal-sap-modules }}
2 changes: 1 addition & 1 deletion .github/workflows/pull-validate-kaniko-build-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
secrets: |-
ado-pat:${{ vars.GCP_KYMA_PROJECT_PROJECT_ID }}/${{ vars.IMAGE_BUILDER_ADO_PAT_GCP_SECRET_NAME }}
- uses: docker://europe-docker.pkg.dev/kyma-project/prod/image-builder:v20241112-fd0d9381
- uses: docker://europe-docker.pkg.dev/kyma-project/prod/image-builder:v20241114-555ad37c
id: build
with:
args: --name=test-infra/ginkgo --context=. --dockerfile=images/ginkgo/Dockerfile --azure-access-token=${{ steps.secrets.outputs.ado-pat }} --oidc-token=${{ steps.get_oidc.outputs.jwt }} --env-file='envs' --build-in-ado=true --test-kaniko-build-config=true --config="./configs/image-builder-client-config.yaml"

0 comments on commit 9fc4c4c

Please sign in to comment.