diff --git a/Makefile b/Makefile index abc81f99..0d4272f8 100644 --- a/Makefile +++ b/Makefile @@ -20,11 +20,12 @@ docker_build: docker_publish: docker push ${devicehub_image} + docker push ${postgres_image} .PHONY: docker docker: $(MAKE) docker_build - #$(MAKE) docker_publish + $(MAKE) docker_publish @printf "\nimage: ${devicehub_image}\n" @printf "\nimage: ${postgres_image}\n" @printf "\ndocker images built and published\n" diff --git a/docker-compose.yml b/docker-compose.yml index 5224073b..bd6c6f6d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: devicehub: init: true # TODO - image: dkr-dsg.ac.upc.edu/devicehub/devicehub:dpp__0fb4fa5b + image: dkr-dsg.ac.upc.edu/devicehub/devicehub:dpp_docker__eafcac09 #build . environment: - DB_USER=${DB_USER} @@ -28,7 +28,7 @@ services: - ${SNAPSHOTS_PATH}:/mnt/snapshots:ro postgres: - image: dkr-dsg.ac.upc.edu/devicehub/postgres:dpp__0fb4fa5b + image: dkr-dsg.ac.upc.edu/devicehub/postgres:dpp_docker__eafcac09 # 4. To create the database. # 5. Give permissions to the corresponding users in the database. # extra src https://github.com/docker-library/docs/blob/master/postgres/README.md#environment-variables