RepoMirrors
/
go-ceph
mirror of https://github.com/ceph/go-ceph
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

makefile: support using multiple base images at one time 

Signed-off-by: John Mulligan <jmulligan@redhat.com>
This commit is contained in:
John Mulligan 2020-06-05 11:36:40 -04:00 committed by John Mulligan
parent 3a561218d4
commit 68f8ce2fee
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile
View File

@ -1,4 +1,4 @@
DOCKER_CI_IMAGE = go-ceph-ci CI_IMAGE_NAME = go-ceph-ci
CONTAINER_CMD := docker CONTAINER_CMD := docker
CONTAINER_OPTS := --security-opt $(shell grep -q selinux /sys/kernel/security/lsm && echo "label=disable" || echo "apparmor:unconfined") CONTAINER_OPTS := --security-opt $(shell grep -q selinux /sys/kernel/security/lsm && echo "label=disable" || echo "apparmor:unconfined")
CONTAINER_CONFIG_DIR := testing/containers/ceph CONTAINER_CONFIG_DIR := testing/containers/ceph
@ -8,6 +8,12 @@ RESULTS_DIR :=
CHECK_GOFMT_FLAGS := -e -s -l CHECK_GOFMT_FLAGS := -e -s -l
IMPLEMENTS_OPTS := IMPLEMENTS_OPTS :=
# the full name of the marker file including the ceph version
BUILDFILE=.build.$(CEPH_VERSION)
# the name of the image plus ceph version as tag
CI_IMAGE_TAG=$(CI_IMAGE_NAME):$(CEPH_VERSION)
SELINUX := $(shell getenforce 2>/dev/null) SELINUX := $(shell getenforce 2>/dev/null)
ifeq ($(SELINUX),Enforcing) ifeq ($(SELINUX),Enforcing)
VOLUME_FLAGS = :z VOLUME_FLAGS = :z
@ -26,8 +32,8 @@ test:
.PHONY: test-docker test-container .PHONY: test-docker test-container
test-docker: test-container test-docker: test-container
test-container: check-ceph-version .build-docker $(RESULTS_DIR) test-container: check-ceph-version $(BUILDFILE) $(RESULTS_DIR)
$(CONTAINER_CMD) run --device /dev/fuse --cap-add SYS_ADMIN $(CONTAINER_OPTS) --rm -v $(CURDIR):/go/src/github.com/ceph/go-ceph$(VOLUME_FLAGS) $(RESULTS_VOLUME) $(DOCKER_CI_IMAGE) $(CONTAINER_CMD) run --device /dev/fuse --cap-add SYS_ADMIN $(CONTAINER_OPTS) --rm -v $(CURDIR):/go/src/github.com/ceph/go-ceph$(VOLUME_FLAGS) $(RESULTS_VOLUME) $(CI_IMAGE_TAG)
ifdef RESULTS_DIR ifdef RESULTS_DIR
$(RESULTS_DIR): $(RESULTS_DIR):
@ -35,17 +41,17 @@ $(RESULTS_DIR):
endif endif
.PHONY: ci-image .PHONY: ci-image
ci-image: .build-docker ci-image: $(BUILDFILE)
.build-docker: $(CONTAINER_CONFIG_DIR)/Dockerfile entrypoint.sh $(BUILDFILE): $(CONTAINER_CONFIG_DIR)/Dockerfile entrypoint.sh
$(CONTAINER_CMD) build --build-arg CEPH_VERSION=$(CEPH_VERSION) -t $(DOCKER_CI_IMAGE) -f $(CONTAINER_CONFIG_DIR)/Dockerfile . $(CONTAINER_CMD) build --build-arg CEPH_VERSION=$(CEPH_VERSION) -t $(CI_IMAGE_TAG) -f $(CONTAINER_CONFIG_DIR)/Dockerfile .
@$(CONTAINER_CMD) inspect -f '{{.Id}}' $(DOCKER_CI_IMAGE) > .build-docker @$(CONTAINER_CMD) inspect -f '{{.Id}}' $(CI_IMAGE_TAG) > $(BUILDFILE)
echo $(CEPH_VERSION) >> .build-docker echo $(CEPH_VERSION) >> $(BUILDFILE)
# check-ceph-version checks for the last used Ceph version in the container # check-ceph-version checks for the last used Ceph version in the container
# image and forces a rebuild of the image in case the Ceph version changed # image and forces a rebuild of the image in case the Ceph version changed
.PHONY: check-ceph-version .PHONY: check-ceph-version
check-ceph-version: check-ceph-version:
@grep -wq '$(CEPH_VERSION)' .build-docker 2>/dev/null || $(RM) .build-docker @grep -wq '$(CEPH_VERSION)' $(BUILDFILE) 2>/dev/null || $(RM) $(BUILDFILE)
check: check-revive check-format check: check-revive check-format