X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=docker%2FMakefile;h=d4be3df46b80ef943563d4d811b1fa958d7ba102;hb=6e177b76d80dc30e471ec9f3500560285c48fc0f;hp=951fda692bc76eb05aae66e9a4e2080ddba60ff7;hpb=251fff5c7fd6f92c1f1acb921233c7e9c7c89003;p=e-mobility-charging-stations-simulator.git

diff --git a/docker/Makefile b/docker/Makefile
index 951fda69..d4be3df4 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,9 +1,9 @@
 PROJECT_NAME?=evse
-NAME:=emobility-charging-stations-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?=emobility-charging-stations-simulator
+DOCKER_ECR_REGISTRY_NAME?=e-mobility-charging-stations-simulator
 DOCKER_ECR_TAG?=latest
 
 .PHONY: all
@@ -19,23 +19,23 @@ ifeq '$(SUBMODULES_INIT)' 'true'
 endif
 
 $(NAME): $(submodules-init)
-	docker-compose -p $(PROJECT_NAME) up -d
+	docker compose -p $(PROJECT_NAME) up -d
 
 $(NAME)-force: $(submodules-init)
-	docker-compose -p $(PROJECT_NAME) up -d --build --force-recreate
+	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
+	-docker compose -p $(PROJECT_NAME) down
 
 clean: clean-containers clean-images
 
 docker-tag-ecr:
-	docker tag $(PROJECT_NAME)_$(NAME) $(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)