trustchain-oc1-orchestral
/
devicehub-teal
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor Makefile 

- use ereuse project (to avoid confusion between devicehub project and
devicehub image)
- facilitate the docker image URL on the make docker_build
This commit is contained in:
pedro 2023-09-21 21:37:37 +02:00
parent 2c4b0006cc
commit 6a58dcc68f
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -1,4 +1,4 @@
project := dkr-dsg.ac.upc.edu/devicehub project := dkr-dsg.ac.upc.edu/ereuse
branch := `git branch --show-current` branch := `git branch --show-current`
commit := `git log -1 --format=%h` commit := `git log -1 --format=%h`
@ -17,6 +17,11 @@ docker_build:
docker build -f docker/postgres.Dockerfile -t ${postgres_image} . docker build -f docker/postgres.Dockerfile -t ${postgres_image} .
# DEBUG # DEBUG
#docker build -f docker/postgres.Dockerfile -t ${postgres_image} . --progress=plain --no-cache #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_publish:
docker push ${devicehub_image} docker push ${devicehub_image}
@ -26,6 +31,4 @@ docker_publish:
docker: docker:
$(MAKE) docker_build $(MAKE) docker_build
$(MAKE) docker_publish $(MAKE) docker_publish
@printf "\nimage: ${devicehub_image}\n" @printf "\ndocker images published\n"
@printf "\nimage: ${postgres_image}\n"
@printf "\ndocker images built and published\n"