Remove -host. Bump versions. Fix previous merge issues. (#16)

* Reference implementation for Selenium on ECS.

* Selenium containers version bump.

* Having -host as an argument now causes problems.

* Fix merge issues…

Author: rrivera-rmn

docker/common/ecs_entry_point.sh

@@ -20,7 +20,7 @@ set -o xtrace
 result="$(python /opt/bin/ecs-get-port-mapping.py)"
 eval "$result"
 
-export SE_OPTS="-host $EC2_HOST -remoteHost http://$EC2_HOST:$PORT_TCP_5555 -id $NODE_ID"
+export SE_OPTS="-remoteHost http://$EC2_HOST:$PORT_TCP_5555 -id $NODE_ID"
 
 # execute default extry_point.sh file
 /opt/bin/entry_point.sh

docker/ecs-node-chrome/Dockerfile

@@ -1,4 +1,4 @@
-ARG VERSION=3.8.1
+ARG VERSION=3.14.0
 FROM selenium/node-chrome:${VERSION}
 LABEL authors=RetailMeNot
 

docker/ecs-node-chrome/Makefile

@@ -1,22 +1,22 @@
 include ../../.env
 export $(shell sed 's/=.*//' ../../.env)
+VERSION=3.14.0
 
-VERSION=3.8.1
 REGISTRY=$(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com
 
 clean:
 	rm -rf common
 
 build:
 	mkdir -p common/
-	rsync -av --exclude='selenium' --exclude='Makefile' ../common/* common/
-	docker build -t ecs-node-chrome --build-arg VERSION=$(VERSION) .
+	rsync -av ../common/* common/
+	docker build -t $(IMAGE_NAME) --build-arg VERSION=$(VERSION) .
 	rm -rf common/
 
 tag: build
-	docker tag ecs-node-chrome $(REGISTRY)/ecs-node-chrome:$(VERSION)
-	docker tag ecs-node-chrome $(REGISTRY)/ecs-node-chrome:latest
+	docker tag $(IMAGE_NAME) $(REGISTRY)/$(IMAGE_NAME):$(VERSION)
+	docker tag $(IMAGE_NAME) $(REGISTRY)/$(IMAGE_NAME):latest
 
 push: tag
-	docker push $(REGISTRY)/ecs-node-chrome:$(VERSION)
-	docker push $(REGISTRY)/ecs-node-chrome:latest
+	docker push $(REGISTRY)/$(IMAGE_NAME):$(VERSION)
+	docker push $(REGISTRY)/$(IMAGE_NAME):latest

docker/ecs-node-firefox/Dockerfile

@@ -1,4 +1,4 @@
-ARG VERSION=3.8.1
+ARG VERSION=3.14.0
 FROM selenium/node-firefox:${VERSION}
 LABEL authors=RetailMeNot
 

docker/ecs-node-firefox/Makefile

@@ -1,22 +1,22 @@
 include ../../.env
 export $(shell sed 's/=.*//' ../../.env)
+VERSION=3.14.0
 
-VERSION=3.8.1
 REGISTRY=$(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com
 
 clean:
 	rm -rf common
 
 build:
 	mkdir -p common/
-	rsync -av --exclude='selenium' --exclude='Makefile' ../common/* common/
-	docker build -t ecs-node-firefox --build-arg VERSION=$(VERSION) .
+	rsync -av ../common/* common/
+	docker build -t $(IMAGE_NAME) --build-arg VERSION=$(VERSION) .
 	rm -rf common/
 
 tag: build
-	docker tag ecs-node-firefox $(REGISTRY)/ecs-node-firefox:$(VERSION)
-	docker tag ecs-node-firefox $(REGISTRY)/ecs-node-firefox:latest
+	docker tag $(IMAGE_NAME) $(REGISTRY)/$(IMAGE_NAME):$(VERSION)
+	docker tag $(IMAGE_NAME) $(REGISTRY)/$(IMAGE_NAME):latest
 
 push: tag
-	docker push $(REGISTRY)/ecs-node-firefox:$(VERSION)
-	docker push $(REGISTRY)/ecs-node-firefox:latest
+	docker push $(REGISTRY)/$(IMAGE_NAME):$(VERSION)
+	docker push $(REGISTRY)/$(IMAGE_NAME):latest