Skip to content

Commit 516c99e

Browse files
committed
Used pattern for rules targetting docker-*
`make help` & `make docker-*` are unchanged: ``` $ make | grep -P '\sdocker-' make docker-alpine Generate local docker images (Alpine) make docker-alpine-dev Generate local docker image (Alpine dev) make docker-alpine-full Generate local docker image (Alpine full) make docker-alpine-minimal Generate local docker image (Alpine minimal) make docker-ubuntu Generate local docker images (Ubuntu) make docker-ubuntu-dev Generate local docker image (Ubuntu dev) make docker-ubuntu-full Generate local docker image (Ubuntu full) make docker-ubuntu-minimal Generate local docker image (Ubuntu minimal) $ make docker-alpine -n docker buildx build --target full -f docker-files/alpine.Dockerfile -t glances:local-alpine-full . docker buildx build --target minimal -f docker-files/alpine.Dockerfile -t glances:local-alpine-minimal . docker buildx build --target dev -f docker-files/alpine.Dockerfile -t glances:local-alpine-dev . $ make docker-ubuntu -n docker buildx build --target full -f docker-files/ubuntu.Dockerfile -t glances:local-ubuntu-full . docker buildx build --target minimal -f docker-files/ubuntu.Dockerfile -t glances:local-ubuntu-minimal . docker buildx build --target dev -f docker-files/ubuntu.Dockerfile -t glances:local-ubuntu-dev . ``` Signed-off-by: Ariel Otilibili <otilibil@eurecom.fr>
1 parent 1fef259 commit 516c99e

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

Makefile

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -223,29 +223,28 @@ snapcraft:
223223
# Need Docker Buildx package (apt install docker-buildx on Ubuntu)
224224
# ===================================================================
225225

226+
define DOCKERFILE
227+
docker-files/$(word 1,$(subst -, ,$*)).Dockerfile
228+
endef
229+
230+
define TARGET
231+
$(word 2,$(subst -, ,$*))
232+
endef
233+
234+
$(DOCKER_IMAGES): docker-%:
235+
$(DOCKER_BUILD) --target $(TARGET) -f $(DOCKERFILE) -t $(DOCKER_TAG) .
236+
226237
docker: docker-alpine docker-ubuntu ## Generate local docker images
227238

228-
docker-alpine: docker-alpine-full docker-alpine-minimal docker-alpine-dev ## Generate local docker images (Alpine)
239+
docker-alpine: $(ALPINE_IMAGES) ## Generate local docker images (Alpine)
240+
docker-ubuntu: $(UBUNTU_IMAGES) ## Generate local docker images (Ubuntu)
229241

230242
docker-alpine-full: ## Generate local docker image (Alpine full)
231-
$(DOCKER_BUILD) --target full -f $(DOCKERFILE_ALPINE) -t glances:local-alpine-full .
232-
233243
docker-alpine-minimal: ## Generate local docker image (Alpine minimal)
234-
$(DOCKER_BUILD) --target minimal -f $(DOCKERFILE_ALPINE) -t glances:local-alpine-minimal .
235-
236244
docker-alpine-dev: ## Generate local docker image (Alpine dev)
237-
$(DOCKER_BUILD) --target dev -f $(DOCKERFILE_ALPINE) -t glances:local-alpine-dev .
238-
239-
docker-ubuntu: docker-ubuntu-full docker-ubuntu-minimal docker-ubuntu-dev ## Generate local docker images (Ubuntu)
240-
241245
docker-ubuntu-full: ## Generate local docker image (Ubuntu full)
242-
$(DOCKER_BUILD) --target full -f $(DOCKERFILE_UBUNTU) -t glances:local-ubuntu-full .
243-
244246
docker-ubuntu-minimal: ## Generate local docker image (Ubuntu minimal)
245-
$(DOCKER_BUILD) --target minimal -f $(DOCKERFILE_UBUNTU) -t glances:local-ubuntu-minimal .
246-
247247
docker-ubuntu-dev: ## Generate local docker image (Ubuntu dev)
248-
$(DOCKER_BUILD) --target dev -f $(DOCKERFILE_UBUNTU) -t glances:local-ubuntu-dev .
249248

250249
# ===================================================================
251250
# Run

0 commit comments

Comments
 (0)