Skip to content

Commit

Permalink
fix ci-images
Browse files Browse the repository at this point in the history
  • Loading branch information
jpinsonneau committed Apr 24, 2023
1 parent 24cfe0b commit 3410d4e
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,14 @@ endif

.PHONY: ci-images-build
ci-images-build: IMAGE_ORG=$(FORCED_CI_ORG)
ci-images-build: image-build ## Build OCI image with the manager.
$(OCI_BIN) build --build-arg BASE_IMAGE=$(IMAGE) -t $(IMAGE_SHA) -f ./shortlived.Dockerfile .
ci-images-build: ## Build OCI image with the manager.
ifeq ($(VERSION), main)
# Also tag "latest" only for branch "main"
$(OCI_BIN) build -t $(IMAGE) -t $(IMAGE_TAG_BASE):latest .
else
$(OCI_BIN) build -t $(IMAGE) .
endif
$(OCI_BIN) build --build-arg BASE_IMAGE=$(IMAGE) -t $(IMAGE_SHA) -f shortlived.Dockerfile .

.PHONY: ci-images-push
ci-images-push: IMAGE_ORG=$(FORCED_CI_ORG)
Expand Down

0 comments on commit 3410d4e

Please sign in to comment.