chore: add podman support to Makefile #9363
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,6 +20,17 @@ BIN ?= velero | |
| # This repo's root import path (under GOPATH). | ||
| PKG := github.com/vmware-tanzu/velero | ||
|
|
||
| # docker (or podman) command. | ||
| ifneq (, $(shell which docker 2>/dev/null)) | ||
| DOCKER := docker | ||
| else ifneq (, $(shell which podman 2>/dev/null)) | ||
| DOCKER := podman | ||
| # map host uid to container uid | ||
| export PODMAN_USERNS=keep-id | ||
| else | ||
| $(error Neither docker nor podman found) | ||
| endif | ||
|
|
||
| # Where to push the docker image. | ||
| REGISTRY ?= velero | ||
| # In order to push images to an insecure registry, follow the two steps: | ||
|
|
@@ -63,7 +74,7 @@ else | |
| endif | ||
|
|
||
| BUILDER_IMAGE := $(REGISTRY)/build-image:$(BUILDER_IMAGE_TAG) | ||
| BUILDER_IMAGE_CACHED := $(shell $(DOCKER) images -q ${BUILDER_IMAGE} 2>/dev/null ) | ||
|
|
||
| HUGO_IMAGE := ghcr.io/gohugoio/hugo | ||
|
|
||
|
|
@@ -86,14 +97,14 @@ endif | |
| # check buildx is enabled only if docker is in path | ||
| # macOS/Windows docker cli without Docker Desktop license: https://github.com/abiosoft/colima | ||
| # To add buildx to docker cli: https://github.com/abiosoft/colima/discussions/273#discussioncomment-2684502 | ||
| ifeq ($(shell which $(DOCKER) 2>/dev/null 1>&2 && $(DOCKER) buildx inspect 2>/dev/null | awk '/Status/ { print $$2 }'), running) | ||
| BUILDX_ENABLED ?= true | ||
| # if emulated docker cli from podman, assume enabled | ||
| # emulated docker cli from podman: https://podman-desktop.io/docs/migrating-from-docker/emulating-docker-cli-with-podman | ||
| # podman known issues: | ||
| # - on remote podman, such as on macOS, | ||
| # --output issue: https://github.com/containers/podman/issues/15922 | ||
| else ifeq ($(shell which $(DOCKER) 2>/dev/null 1>&2 && cat $(shell which $(DOCKER)) | grep -c "exec podman"), 1) | ||
iTrooz marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| BUILDX_ENABLED ?= true | ||
| else | ||
| BUILDX_ENABLED ?= false | ||
|
|
@@ -200,7 +211,7 @@ shell: build-dirs build-env | |
| @# because the Kubernetes code-generator tools require the project to | ||
| @# exist in a directory hierarchy ending like this (but *NOT* necessarily | ||
| @# under $GOPATH). | ||
| @$(DOCKER) run \ | ||
| -e GOFLAGS \ | ||
| -e GOPROXY \ | ||
| -i $(TTY) \ | ||
|
|
@@ -224,11 +235,11 @@ endif | |
|
|
||
| ifeq ($(BUILDX_INSTANCE),) | ||
| @echo creating a buildx instance | ||
| -$(DOCKER) buildx rm velero-builder || true | ||
|
Contributor
There was a problem hiding this comment. I'm uncertain about this place.
Contributor
There was a problem hiding this comment. I found something here.
Collaborator
There was a problem hiding this comment. Some commands are the same some are not. |
||
| @$(DOCKER) buildx create --use --name=velero-builder | ||
| else | ||
| @echo using a specified buildx instance $(BUILDX_INSTANCE) | ||
| @$(DOCKER) buildx use $(BUILDX_INSTANCE) | ||
| endif | ||
|
|
||
| @mkdir -p _output | ||
|
|
@@ -249,7 +260,7 @@ container-linux-%: | |
| container-linux: | ||
| @echo "building container: $(IMAGE):$(VERSION)-linux-$(BUILDX_ARCH)" | ||
|
|
||
| @$(DOCKER) buildx build --pull \ | ||
| --output="type=$(BUILD_OUTPUT_TYPE)$(if $(findstring tar, $(BUILD_OUTPUT_TYPE)),$(comma)dest=_output/$(BIN)-$(VERSION)-linux-$(BUILDX_ARCH).tar,)" \ | ||
| --platform="linux/$(BUILDX_ARCH)" \ | ||
| $(addprefix -t , $(addsuffix "-linux-$(BUILDX_ARCH)",$(ALL_IMAGE_TAGS))) \ | ||
|
|
@@ -273,7 +284,7 @@ container-windows-%: | |
| container-windows: | ||
| @echo "building container: $(IMAGE):$(VERSION)-windows-$(BUILDX_OSVERSION)-$(BUILDX_ARCH)" | ||
|
|
||
| @$(DOCKER) buildx build --pull \ | ||
| --output="type=$(BUILD_OUTPUT_TYPE)$(if $(findstring tar, $(BUILD_OUTPUT_TYPE)),$(comma)dest=_output/$(BIN)-$(VERSION)-windows-$(BUILDX_OSVERSION)-$(BUILDX_ARCH).tar,)" \ | ||
| --platform="windows/$(BUILDX_ARCH)" \ | ||
| $(addprefix -t , $(addsuffix "-windows-$(BUILDX_OSVERSION)-$(BUILDX_ARCH)",$(ALL_IMAGE_TAGS))) \ | ||
|
|
@@ -293,22 +304,22 @@ container-windows: | |
|
|
||
| push-manifest: | ||
| @echo "building manifest: $(IMAGE_TAG) for $(foreach osarch, $(ALL_OS_ARCH), $(IMAGE_TAG)-${osarch})" | ||
| @$(DOCKER) manifest create --amend --insecure=$(INSECURE_REGISTRY) $(IMAGE_TAG) $(foreach osarch, $(ALL_OS_ARCH), $(IMAGE_TAG)-${osarch}) | ||
|
|
||
| @set -x; \ | ||
| for arch in $(ALL_ARCH.windows); do \ | ||
| for osversion in $(ALL_OSVERSIONS.windows); do \ | ||
| BASEIMAGE=mcr.microsoft.com/windows/nanoserver:$${osversion}; \ | ||
| full_version=`$(DOCKER) manifest inspect --insecure=$(INSECURE_REGISTRY) $${BASEIMAGE} | jq -r '.manifests[0].platform["os.version"]'`; \ | ||
| $(DOCKER) manifest annotate --os windows --arch $${arch} --os-version $${full_version} $(IMAGE_TAG) $(IMAGE_TAG)-windows-$${osversion}-$${arch}; \ | ||
| done; \ | ||
| done | ||
|
|
||
| @echo "pushing manifest $(IMAGE_TAG)" | ||
| @$(DOCKER) manifest push --purge --insecure=$(INSECURE_REGISTRY) $(IMAGE_TAG) | ||
|
|
||
| @echo "pushed manifest $(IMAGE_TAG):" | ||
| @$(DOCKER) manifest inspect --insecure=$(INSECURE_REGISTRY) $(IMAGE_TAG) | ||
|
|
||
| SKIP_TESTS ?= | ||
| test: build-dirs | ||
|
|
@@ -365,21 +376,21 @@ else ifneq ($(BUILDER_IMAGE_CACHED),) | |
| @echo "Using Cached Image: $(BUILDER_IMAGE)" | ||
| else | ||
| @echo "Trying to pull build-image: $(BUILDER_IMAGE)" | ||
| $(DOCKER) pull -q $(BUILDER_IMAGE) || $(MAKE) build-image | ||
| endif | ||
|
|
||
| build-image: | ||
| @# When we build a new image we just untag the old one. | ||
| @# This makes sure we don't leave the orphaned image behind. | ||
| $(eval old_id=$(shell $(DOCKER) image inspect --format '{{ .ID }}' ${BUILDER_IMAGE} 2>/dev/null)) | ||
| ifeq ($(BUILDX_ENABLED), true) | ||
| @cd hack/build-image && $(DOCKER) buildx build --build-arg=GOPROXY=$(GOPROXY) --output=type=docker --pull -t $(BUILDER_IMAGE) -f $(BUILDER_IMAGE_DOCKERFILE_REALPATH) . | ||
| else | ||
| @cd hack/build-image && $(DOCKER) build --build-arg=GOPROXY=$(GOPROXY) --pull -t $(BUILDER_IMAGE) -f $(BUILDER_IMAGE_DOCKERFILE_REALPATH) . | ||
| endif | ||
| $(eval new_id=$(shell $(DOCKER) image inspect --format '{{ .ID }}' ${BUILDER_IMAGE} 2>/dev/null)) | ||
| @if [ "$(old_id)" != "" ] && [ "$(old_id)" != "$(new_id)" ]; then \ | ||
| $(DOCKER) rmi -f $$id || true; \ | ||
| fi | ||
|
|
||
| push-build-image: | ||
|
|
@@ -390,21 +401,21 @@ ifneq "$(origin BUILDER_IMAGE_DOCKERFILE)" "file" | |
| @echo "Dockerfile for builder image has been overridden" | ||
| @echo "Skipping push of custom image" | ||
| else | ||
| $(DOCKER) push $(BUILDER_IMAGE) | ||
| endif | ||
|
|
||
| build-image-hugo: | ||
| cd site && $(DOCKER) build --pull -t $(HUGO_IMAGE) . | ||
|
|
||
| clean: | ||
| # if we have a cached image then use it to run go clean --modcache | ||
| # this test checks if we there is an image id in the BUILDER_IMAGE_CACHED variable. | ||
| ifneq ($(strip $(BUILDER_IMAGE_CACHED)),) | ||
| $(MAKE) shell CMD="-c 'go clean --modcache'" | ||
| $(DOCKER) rmi -f $(BUILDER_IMAGE) || true | ||
| endif | ||
| rm -rf .go _output | ||
| $(DOCKER) rmi $(HUGO_IMAGE) | ||
|
|
||
|
|
||
| .PHONY: modules | ||
|
|
@@ -449,7 +460,7 @@ release: | |
| ./hack/release-tools/goreleaser.sh'" | ||
|
|
||
| serve-docs: build-image-hugo | ||
| $(DOCKER) run \ | ||
| --rm \ | ||
| -v "$$(pwd)/site:/project" \ | ||
| -it -p 1313:1313 \ | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's better to use another word instead of
DOCKER.Essentially, podman is different from docker.
Using
DOCKERis misleading.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Image tool, Container or builder should work
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I initially named it DOCKER because that command had to be compatible with the Docker CLI interface, but okay I'll make the change