Merge branch 'master' of github.com:RetailMeNotSandbox/ecs-selenium

Author: robertoriv

.env.sample

@@ -0,0 +1,2 @@
+AWS_ACCOUNT_ID=111122223333
+AWS_AWS_REGION=eu-central-1

.gitignore

@@ -1,3 +1,4 @@
+.env
 *.jar
 /docker/common/selenium
 docker/ecs-node-chrome/common/

README.md

@@ -44,16 +44,20 @@ aws --region <region> ecr create-repository --repository-name ecs-node-chrome
 You now need to build and push the node images to your docker registry. ECR is assumed by default. You can rebuild your images periodically to get newer browsers in your cluster.
 
 ```bash
+# setup environment
+echo "AWS_ACCOUNT_ID=111122223333" > .env
+echo "AWS_REGION=<region>" >> .env
+
 # login to ecr
-$(aws ecr get-login --region <region> --no-include-email)
+$(aws ecr get-login --no-include-email)
 
 # build and push firefox
 cd docker/ecs-node-firefox
-make push ACCOUNT_ID=111122223333 REGION=<region>
+make push
 
 # build and push chrome
 cd docker/ecs-node-chrome
-make push ACCOUNT_ID=111122223333 REGION=<region>
+make push
 ```
 
 ## Setup

docker/ecs-node-chrome/Makefile

@@ -1,7 +1,8 @@
+include ../../.env
+export $(shell sed 's/=.*//' ../../.env)
+
 VERSION=3.8.1
-REGION=us-west-2
-ACCOUNT_ID=111122223333
-REGISTRY=$(ACCOUNT_ID).dkr.ecr.$(REGION).amazonaws.com
+REGISTRY=$(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com
 
 clean:
 	rm -rf common

docker/ecs-node-firefox/Makefile

@@ -1,7 +1,8 @@
+include ../../.env
+export $(shell sed 's/=.*//' ../../.env)
+
 VERSION=3.8.1
-REGION=us-west-2
-ACCOUNT_ID=111122223333
-REGISTRY=$(ACCOUNT_ID).dkr.ecr.$(REGION).amazonaws.com
+REGISTRY=$(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com
 
 clean:
 	rm -rf common