[CP 1631] Add CONTAINER_ENGINE to makefile - #622
Open
ci-penbot-01 wants to merge 1 commit into
Open
Conversation
Signed-off-by: Landon LaSmith <LLaSmith@redhat.com> (cherry picked from commit 3c7ef22f836c68d4955a09f3d7477cc0e964bff1)
Contributor
Author
AI-Assisted Cherry-PickSource PR: #1631 The cherry-pick operation encountered merge conflicts which were resolved automatically using AI assistance. Files with conflicts (resolved by AI):
Original conflict in MakefileAdded missing REMEDIATION_CONFIGMAP_UTIL variable definitions that were needed for the new targets being introducedOriginal conflict in Makefile<<<<<<< HEAD
@docker run --rm $(DOCKER_IT_FLAGS) --privileged \
=======
@$(CONTAINER_ENGINE) run --rm -it --privileged \
>>>>>>> 3c7ef22f... Add CONTAINER_ENGINE to makefile (#1631)
Resolution: Used $(CONTAINER_ENGINE) from incoming but kept $(DOCKER_IT_FLAGS) from HEAD for better CI supportOriginal conflict in Makefile<<<<<<< HEAD
=======
.PHONY: docker-build-remediation-configmap-util
docker-build-remediation-configmap-util: ## Build the docker image for remediation configmap util.
DOCKER_BUILDKIT=1 $(CONTAINER_ENGINE) build -t $(REMEDIATION_CONFIGMAP_UTIL_IMG) --label HOURLY_TAG=$(HOURLY_TAG_LABEL) --build-arg version=$(PROJECT_VERSION) --build-arg release=$(IMAGE_TAG) -f internal/remediation_config_utils_container/Dockerfile internal/remediation_config_utils_container
.PHONY: docker-push-remediation-configmap-util
docker-push-remediation-configmap-util: ## Push the docker image for remediation configmap util.
$(CONTAINER_ENGINE) push $(REMEDIATION_CONFIGMAP_UTIL_IMG)
.PHONY: docker-save-remediation-configmap-util
docker-save-remediation-configmap-util: ## Save the docker image for remediation configmap util.
$(CONTAINER_ENGINE) save $(REMEDIATION_CONFIGMAP_UTIL_IMG) | gzip > $(IMAGE_NAME)-remediation-configmap-util.tar.gz
>>>>>>> 3c7ef22f... Add CONTAINER_ENGINE to makefile (#1631)
Resolution: Added all three remediation-configmap-util targets from incoming commitCherry-pick triggered by: ACP-Automation |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
cp of pensando/gpu-operator#1631
Source PR Description (pensando/gpu-operator#1631):
Add
CONTAINER_ENGINE ?= dockerto the Makefile in support of alternativedockercompatible container tools. The same functionality exists in the network-operator and simplifies development builds for anyone using a docker alternative likepodman.This does not affect any existing workflows or CI/CD and only supports local development builds that do not use
dockerTESTING
I use
make CONTAINER_ENGINE=podman docker-build bundle-buildin my workflow for dev builds.Cherrypick triggered by: ACP-Automation