Skip to content

GitLab

Commit 2853b1c9 authored by Antoine Kaufmann's avatar Antoine Kaufmann
Browse files

docker: cleanup rules.mk

parent 950e4d35
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 9 deletions
docker/rules.mk
View file @ 2853b1c9
...@@ -26,6 +26,10 @@ include mk/subdir_pre.mk ...@@ -26,6 +26,10 @@ include mk/subdir_pre.mk
# DOCKER_REGISTRY ?= docker.io/ # DOCKER_REGISTRY ?= docker.io/
# DOCKER_TAG ?= :latest # DOCKER_TAG ?= :latest
DOCKER_IMAGES := simbricks/simbricks-build simbricks/simbricks-base \
simbricks/simbricks simbricks/simbricks-runenv simbricks/simbricks-min \
simbricks/simbricks-dist-worker simbricks/simbricks-gem5opt
docker-images: docker-images:
docker build -t \ docker build -t \
$(DOCKER_REGISTRY)simbricks/simbricks-build$(DOCKER_TAG) \ $(DOCKER_REGISTRY)simbricks/simbricks-build$(DOCKER_TAG) \
...@@ -56,15 +60,8 @@ docker-images-tofino: ...@@ -56,15 +60,8 @@ docker-images-tofino:
-f docker/Dockerfile.tofino . -f docker/Dockerfile.tofino .
docker-push: docker-push:
for i in \ for i in $(addprefix $(DOCKER_REGISTRY), $(addsuffix $(DOCKER_TAG), \
$(DOCKER_REGISTRY)simbricks/simbricks-build$(DOCKER_TAG) \ $(DOCKER_IMAGES))) ; do \
$(DOCKER_REGISTRY)simbricks/simbricks-base$(DOCKER_TAG) \
$(DOCKER_REGISTRY)simbricks/simbricks$(DOCKER_TAG) \
$(DOCKER_REGISTRY)simbricks/simbricks-runenv$(DOCKER_TAG) \
$(DOCKER_REGISTRY)simbricks/simbricks-min$(DOCKER_TAG) \
$(DOCKER_REGISTRY)simbricks/simbricks-dist-worker$(DOCKER_TAG) \
$(DOCKER_REGISTRY)simbricks/simbricks-gem5opt$(DOCKER_TAG) \
; do \
docker image inspect $$i >/dev/null && docker push $$i ; \ docker image inspect $$i >/dev/null && docker push $$i ; \
done done
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment