Skip to content

Commit

Permalink
Fix bug: 2.11 images should not use 2.9 pipfile (operator-framework#5417
Browse files Browse the repository at this point in the history
)

Signed-off-by: austin <[email protected]>
  • Loading branch information
asmacdo authored Nov 29, 2021
1 parent dca3ef0 commit b26427b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
uses: docker/build-push-action@v2
with:
file: ./images/ansible-operator-2.11-preview/base.Dockerfile
context: ./images/ansible-operator
context: ./images/ansible-operator-2.11-preview
platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x
push: true
tags: ${{ steps.base_tag_211.outputs.tag }}
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ image/%:

image-base/%: export DOCKER_CLI_EXPERIMENTAL = enabled
image-base/%:
docker buildx build $(DOCKER_PROGRESS) -t $(BUILD_IMAGE_REPO)/$*:dev -f ./images/$*/base.Dockerfile --load images/$*
docker buildx build $(DOCKER_PROGRESS) -t $(BUILD_IMAGE_REPO)/$*-base:dev -f ./images/$*/base.Dockerfile --load images/$*
##@ Release

.PHONY: release
Expand Down

0 comments on commit b26427b

Please sign in to comment.