Improve the makefile setup (#1597)

* Remove containers when stopping them

This ensures that starting the setup again picks up the new version of
the image during the next run.

* Clean docker setups in components

The components should be pulling the images they launch and not a
different tag. And they should not try to start the shared localstack
container when the image they use is not localstack. Instead, the should
check for the shared container created by the root Makefile

* Clean all docker images of the root Makefile

* Change the root Makefile to be consistent with services

Instead of having `make stop-docker` triggering the `clean` command
(which also triggers the cleaning of sub-services), it is now `clean`
which depends on `stop-docker` of the root repo.
This brings consistency with initialization commands. We now have a
symmetry between `initialize`/`clean` and `start-docker`/`stop-docker`.

Author: stof

Makefile

@@ -4,7 +4,7 @@ SUBCLEAN = $(addsuffix .clean,$(COMPONENTS))
 SUBINITIALIZE = $(addsuffix .initialize,$(COMPONENTS))
 
 .PHONY: clean $(SUBCLEAN)
-clean: $(SUBCLEAN)
+clean: stop-docker $(SUBCLEAN)
 $(SUBCLEAN): %.clean:
 	$(MAKE) -C $* clean
 
@@ -30,8 +30,13 @@ start-docker-kms:
 	docker start async_aws_kms && exit 0 || \
 	docker run -d -p 4579:8080 --name async_aws_kms nsmithuk/local-kms
 
-stop-docker: clean
+stop-docker:
 	docker stop async_aws_localstack || true
+	docker rm async_aws_localstack || true
+	docker stop async_aws_s3 || true
+	docker rm async_aws_s3 || true
+	docker stop async_aws_kms || true
+	docker rm async_aws_kms || true
 
 test: initialize
 	./vendor/bin/simple-phpunit

src/Core/Makefile

@@ -14,3 +14,4 @@ test: initialize
 clean: stop-docker
 stop-docker:
 	docker stop async_aws_localstack-sts || true
+	docker rm async_aws_localstack-sts || true

src/Service/CloudFormation/Makefile

@@ -14,3 +14,4 @@ test: initialize
 clean: stop-docker
 stop-docker:
 	docker stop async_aws_localstack-cloudformation || true
+	docker rm async_aws_localstack-cloudformation || true

src/Service/CloudWatchLogs/Makefile

@@ -14,3 +14,4 @@ test: initialize
 clean: stop-docker
 stop-docker:
 	docker stop async_aws_localstack-logs || true
+	docker rm async_aws_localstack-logs || true

src/Service/DynamoDb/Makefile

@@ -14,3 +14,4 @@ test: initialize
 clean: stop-docker
 stop-docker:
 	docker stop async_aws_localstack-dynamodb || true
+	docker rm async_aws_localstack-dynamodb || true

src/Service/EventBridge/Makefile

@@ -14,3 +14,4 @@ test: initialize
 clean: stop-docker
 stop-docker:
 	docker stop async_aws_localstack-events || true
+	docker rm async_aws_localstack-events || true

src/Service/Iam/Makefile

@@ -14,3 +14,4 @@ test: initialize
 clean: stop-docker
 stop-docker:
 	docker stop async_aws_localstack-iam || true
+	docker rm async_aws_localstack-iam || true

src/Service/Kinesis/Makefile

@@ -14,3 +14,4 @@ test: initialize
 clean: stop-docker
 stop-docker:
 	docker stop async_aws_localstack-kinesis || true
+	docker rm async_aws_localstack-kinesis || true

src/Service/Kms/Makefile

@@ -2,9 +2,9 @@
 
 initialize: start-docker
 start-docker:
-	docker start async_aws_localstack && exit 0 || \
+	docker start async_aws_kms && exit 0 || \
 	docker start async_aws_localstack-kms && exit 0 || \
-	docker pull localstack/localstack:0.14.2 && \
+	docker pull nsmithuk/local-kms && \
 	docker run -d -p 4579:8080 --name async_aws_localstack-kms nsmithuk/local-kms && \
 	docker run --rm --link async_aws_localstack-kms:localstack martin/wait -c localstack:8080
 
@@ -14,3 +14,4 @@ test: initialize
 clean: stop-docker
 stop-docker:
 	docker stop async_aws_localstack-kms || true
+	docker rm async_aws_localstack-kms || true

src/Service/Lambda/Makefile

@@ -5,7 +5,7 @@ ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 initialize: start-docker
 start-docker:
 	docker start async_aws_lambda && exit 0 || \
-	docker pull lambci/lambda && \
+	docker pull lambci/lambda:nodejs12.x && \
 	docker run -d -p 9001:9001 -e DOCKER_LAMBDA_STAY_OPEN=1 -v "$(ROOT_DIR)/tests/fixtures/lambda":/var/task:ro,delegated --name async_aws_lambda lambci/lambda:nodejs12.x index.handler
 
 test: initialize
@@ -14,3 +14,4 @@ test: initialize
 clean: stop-docker
 stop-docker:
 	docker stop async_aws_lambda || true
+	docker rm async_aws_lambda || true

src/Service/Route53/Makefile

@@ -14,3 +14,4 @@ test: initialize
 clean: stop-docker
 stop-docker:
 	docker stop async_aws_localstack-route53 || true
+	docker rm async_aws_localstack-route53 || true

src/Service/S3/Makefile

@@ -13,3 +13,4 @@ test: initialize
 clean: stop-docker
 stop-docker:
 	docker stop async_aws_s3-client || true
+	docker rm async_aws_s3-client || true

src/Service/SecretsManager/Makefile

@@ -14,4 +14,4 @@ test: initialize
 clean: stop-docker
 stop-docker:
 	docker stop async_aws_localstack-secretsmanager || true
-
+	docker rm async_aws_localstack-secretsmanager || true

src/Service/Sns/Makefile

@@ -14,3 +14,4 @@ test: initialize
 clean: stop-docker
 stop-docker:
 	docker stop async_aws_localstack-sns || true
+	docker rm async_aws_localstack-sns || true

src/Service/Sqs/Makefile

@@ -12,3 +12,4 @@ test: initialize
 clean: stop-docker
 stop-docker:
 	docker stop async_aws_sqs || true
+	docker rm async_aws_sqs || true

src/Service/Ssm/Makefile

@@ -14,3 +14,4 @@ test: initialize
 clean: stop-docker
 stop-docker:
 	docker stop async_aws_localstack-ssm || true
+	docker rm async_aws_localstack-ssm || true