Fix and add log messages

[e-mobility-charging-stations-simulator.git] / docker / Makefile

diff --git a/docker/Makefile b/docker/Makefile
index 2b58f2db5ca65bd66cd9312701d44c7beba53d5e..388c705cf7b467815f533de532a8fbeb747e4664 100644 (file)
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,8 +1,9 @@
 PROJECT_NAME?=evse
-NAME:=simulator
+NAME:=e-mobility-charging-stations-simulator
+SUBMODULES_INIT?=false
 DOCKER_ECR_ACCOUNT_ID?=166296450311
 DOCKER_ECR_REGION?=eu-west-3
-DOCKER_ECR_REGISTRY_NAME?=ev_simulator
+DOCKER_ECR_REGISTRY_NAME?=e-mobility-charging-stations-simulator
 DOCKER_ECR_TAG?=latest
 
 .PHONY: all
@@ -12,16 +13,21 @@ default: all
 submodule-update:
        git submodule update --init --recursive
 
-$(NAME): submodule-update
+submodules-init=
+ifeq '$(SUBMODULES_INIT)' 'true'
+       submodules-init += submodule-update
+endif
+
+$(NAME): $(submodules-init)
        docker-compose -p $(PROJECT_NAME) up -d
 
-$(NAME)-force: submodule-update
+$(NAME)-force: $(submodules-init)
        docker-compose -p $(PROJECT_NAME) up -d --build --force-recreate
 
 all: $(NAME)
 
 clean-images:
-       -docker rmi $(PROJECT_NAME)_$(NAME)
+       -docker rmi $(PROJECT_NAME)-$(NAME)
 
 clean-containers:
        -docker-compose -p $(PROJECT_NAME) down
@@ -29,7 +35,7 @@ clean-containers:
 clean: clean-containers clean-images
 
 docker-tag-ecr:
-       docker tag $(PROJECT_NAME)_$(NAME):$(DOCKER_ECR_TAG) $(DOCKER_ECR_ACCOUNT_ID).dkr.ecr.$(DOCKER_ECR_REGION).amazonaws.com/$(DOCKER_ECR_REGISTRY_NAME):$(DOCKER_ECR_TAG)
+       docker tag $(PROJECT_NAME)-$(NAME) $(DOCKER_ECR_ACCOUNT_ID).dkr.ecr.$(DOCKER_ECR_REGION).amazonaws.com/$(DOCKER_ECR_REGISTRY_NAME):$(DOCKER_ECR_TAG)
 
 docker-push-ecr: $(NAME)-force docker-tag-ecr
        aws ecr get-login-password --region $(DOCKER_ECR_REGION) | docker login --username AWS --password-stdin $(DOCKER_ECR_ACCOUNT_ID).dkr.ecr.$(DOCKER_ECR_REGION).amazonaws.com/$(DOCKER_ECR_REGISTRY_NAME)