Skip to content

add a podman option to Makefile #547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
elmiko wants to merge 1 commit into from
Closed

add a podman option to Makefile #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,19 @@ endif
.PHONY: all
all: check build test

USE_PODMAN ?= 0
NO_DOCKER ?= 0
ifeq ($(NO_DOCKER), 1)
DOCKER_CMD =
IMAGE_BUILD_CMD = imagebuilder
else
DOCKER_CMD := docker run --env GO111MODULE=$(GO111MODULE) --env GOFLAGS=$(GOFLAGS) --rm -v "$(PWD)":/go/src/github.com/openshift/machine-api-operator:Z -w /go/src/github.com/openshift/machine-api-operator golang:1.13
IMAGE_BUILD_CMD = docker build
ifeq ($(USE_PODMAN), 1)
OCI_BINARY = podman
else
OCI_BINARY = docker
endif
DOCKER_CMD := $(OCI_BINARY) run --env GO111MODULE=$(GO111MODULE) --env GOFLAGS=$(GOFLAGS) --rm -v "$(PWD)":/go/src/github.com/openshift/machine-api-operator:Z -w /go/src/github.com/openshift/machine-api-operator golang:1.13
IMAGE_BUILD_CMD = $(OCI_BINARY) build
endif

.PHONY: vendor
Expand Down
5 changes: 5 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@ machine.openshift.io/cluster-api-machine-type: worker
$ make image
```

Please note that by default make will attempt to use the `docker` command
to create binaries and images. If you would like to disable this behavior, set
the environment variable `NO_DOCKER=1`. Alternatively if you woud like to use
`podman`, set the environment variable `USE_PODMAN=1`.

The Machine API Operator is designed to work in conjunction with the [Cluster Version Operator](https://github.com/openshift/cluster-version-operator).
You can see it in action by running an [OpenShift Cluster deployed by the Installer](https://github.com/openshift/installer).

Expand Down