RepoMirrors/go-ceph
1
0
Fork 0
mirror of https://github.com/ceph/go-ceph synced 2025-01-24 07:02:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

makefile: support using other container runtimes

Browse Source 
Add new variables to the Makefile that allow the use of other container
runtimes (that have a docker compatible cli) and allow setting extra
opts to work on platforms that don't run apparmor.
All defaults continue to be the same as before.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
This commit is contained in:
John Mulligan 2019-10-21 19:04:22 -04:00 committed by John Mulligan
parent e32f9f0f2e
commit ef655aa904
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -1,4 +1,7 @@
DOCKER_CI_IMAGE = go-ceph-ci DOCKER_CI_IMAGE = go-ceph-ci
CONTAINER_CMD := docker
CONTAINER_OPTS := --security-opt apparmor:unconfined
build: build:
go build -v go build -v
fmt: fmt:
@ -7,11 +10,11 @@ test:
go test -v ./... go test -v ./...
test-docker: .build-docker test-docker: .build-docker
docker run --device /dev/fuse --cap-add SYS_ADMIN --security-opt apparmor:unconfined --rm -it -v $(CURDIR):/go/src/github.com/ceph/go-ceph $(DOCKER_CI_IMAGE) $(CONTAINER_CMD) run --device /dev/fuse --cap-add SYS_ADMIN $(CONTAINER_OPTS) --rm -it -v $(CURDIR):/go/src/github.com/ceph/go-ceph $(DOCKER_CI_IMAGE)
.build-docker: .build-docker:
docker build -t $(DOCKER_CI_IMAGE) . $(CONTAINER_CMD) build -t $(DOCKER_CI_IMAGE) .
@docker inspect -f '{{.Id}}' $(DOCKER_CI_IMAGE) > .build-docker @$(CONTAINER_CMD) inspect -f '{{.Id}}' $(DOCKER_CI_IMAGE) > .build-docker
check: check:
# TODO: add this when golint is fixed @for d in $$(go list ./... | grep -v /vendor/); do golint -set_exit_status $${d}; done # TODO: add this when golint is fixed @for d in $$(go list ./... | grep -v /vendor/); do golint -set_exit_status $${d}; done