From 6a58dcc68f4eec3958fbea8e2b7c4f1358ad3b92 Mon Sep 17 00:00:00 2001 From: pedro Date: Thu, 21 Sep 2023 21:37:37 +0200 Subject: [PATCH] refactor Makefile - use ereuse project (to avoid confusion between devicehub project and devicehub image) - facilitate the docker image URL on the make docker_build --- Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 0d4272f8..a51c1cf5 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -project := dkr-dsg.ac.upc.edu/devicehub +project := dkr-dsg.ac.upc.edu/ereuse branch := `git branch --show-current` commit := `git log -1 --format=%h` @@ -17,6 +17,11 @@ docker_build: docker build -f docker/postgres.Dockerfile -t ${postgres_image} . # DEBUG #docker build -f docker/postgres.Dockerfile -t ${postgres_image} . --progress=plain --no-cache + @printf "\n##########################\n" + @printf "\ndevicehub image: ${devicehub_image}\n" + @printf "postgres image: ${postgres_image}\n" + @printf "\ndocker images built\n" + @printf "\n##########################\n\n" docker_publish: docker push ${devicehub_image} @@ -26,6 +31,4 @@ docker_publish: docker: $(MAKE) docker_build $(MAKE) docker_publish - @printf "\nimage: ${devicehub_image}\n" - @printf "\nimage: ${postgres_image}\n" - @printf "\ndocker images built and published\n" + @printf "\ndocker images published\n"