Skip to content

[CP 1631] Add CONTAINER_ENGINE to makefile - #622

Open
ci-penbot-01 wants to merge 1 commit into
ROCm:mainfrom
ci-penbot-01:CP.O2O.pensando.gpu-operator.1631.rocm.gpu-operator.main
Open

[CP 1631] Add CONTAINER_ENGINE to makefile#622
ci-penbot-01 wants to merge 1 commit into
ROCm:mainfrom
ci-penbot-01:CP.O2O.pensando.gpu-operator.1631.rocm.gpu-operator.main

Conversation

@ci-penbot-01

Copy link
Copy Markdown
Contributor

cp of pensando/gpu-operator#1631


Source PR Description (pensando/gpu-operator#1631):

Add CONTAINER_ENGINE ?= docker to the Makefile in support of alternative docker compatible container tools. The same functionality exists in the network-operator and simplifies development builds for anyone using a docker alternative like podman.

This does not affect any existing workflows or CI/CD and only supports local development builds that do not use docker

TESTING
I use make CONTAINER_ENGINE=podman docker-build bundle-build in my workflow for dev builds.

Cherrypick triggered by: ACP-Automation

Signed-off-by: Landon LaSmith <LLaSmith@redhat.com>
(cherry picked from commit 3c7ef22f836c68d4955a09f3d7477cc0e964bff1)
@ci-penbot-01

Copy link
Copy Markdown
Contributor Author

AI-Assisted Cherry-Pick

Source PR: #1631
Target Branch: main

The cherry-pick operation encountered merge conflicts which were resolved automatically using AI assistance.

Files with conflicts (resolved by AI):

  • Makefile:44-48
  • Makefile:156-160
  • Makefile:384-398
Original conflict in Makefile
Added missing REMEDIATION_CONFIGMAP_UTIL variable definitions that were needed for the new targets being introduced
Original 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 support
Original 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 commit

Cherry-pick triggered by: ACP-Automation

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants