Switch to branch layout

.gitlab-ci.yml

@@ -19,5 +19,4 @@ build:
   tags:
     - docker-build-arm
   script:
-    - make
-    - '[ "$CI_COMMIT_REF_NAME" != master ] || make push'
+    - make all push

Makefile

-TARGETS := stretch
-TARGETS_PUSH := $(TARGETS:=-push)
-TARGETS_CLEAN := $(TARGETS:=-clean)
+IMAGE_PREFIX := ${DOCKER_IMAGE_PREFIX}
+ifeq ($(IMAGE_PREFIX),)
+IMAGE_PREFIX := icinga/raspbian/
+endif
 
-all: $(TARGETS)
-push: $(TARGETS_PUSH)
-clean: $(TARGETS_CLEAN)
+REGISTRY := ${DOCKER_REGISTRY}
+ifneq ($(REGISTRY),)
+IMAGE_PREFIX := $(REGISTRY)/$(IMAGE_PREFIX)
+endif
 
-$(TARGETS):
-	$(MAKE) -C $@
+FROM := $(shell grep FROM Dockerfile | cut -d" " -f2)
+IMAGE := $(IMAGE_PREFIX)${CI_COMMIT_REF_NAME}
 
-$(TARGETS_PUSH):
-	$(MAKE) -C $(@:-push=) push
+all: pull build
 
-$(TARGETS_CLEAN):
-	$(MAKE) -C $(@:-clean=) clean
+pull:
+	docker pull "$(IMAGE)" || true
+	docker pull "$(FROM)"
 
-.PHONY: all push clean $(TARGETS) $(TARGETS_PUSH) $(TARGETS_CLEAN)
+build:
+	docker build --cache-from "${IMAGE}" --tag "$(IMAGE)" .
+
+push:
+	docker push "$(IMAGE)"
+
+clean:
+	if (docker inspect --type image "$(IMAGE)" >/dev/null 2>&1); then docker rmi "$(IMAGE)"; fi

image.mk

-OS := raspbian
-
-IMAGE_PREFIX := ${DOCKER_IMAGE_PREFIX}
-ifeq ($(IMAGE_PREFIX),)
-IMAGE_PREFIX := icinga/raspbian/
-endif
-
-REGISTRY := ${DOCKER_REGISTRY}
-ifneq ($(REGISTRY),)
-IMAGE_PREFIX := $(REGISTRY)/$(IMAGE_PREFIX)
-endif
-
-FROM := $(shell grep FROM Dockerfile | cut -d" " -f2)
-DIST := $(shell basename `pwd`)
-IMAGE := $(IMAGE_PREFIX)$(DIST)
-
-all: pull build
-
-pull:
-	docker pull "$(IMAGE)" || true
-	docker pull "$(FROM)"
-
-build:
-	docker build --cache-from "${IMAGE}" --tag "$(IMAGE)" .
-
-push:
-	docker push "$(IMAGE)"
-
-clean:
-	if (docker inspect --type image "$(IMAGE)" >/dev/null 2>&1); then docker rmi "$(IMAGE)"; fi

stretch/Makefile

-include ../image.mk