chore: Dockerize E2E tests

Adds the e2e target to our Makefile which
runs our e2e tests as a container. This ensures
isolation. The e2e environment has Docker running
so we can run docker build and docker push.

Author: kohidave

.dockerignore

@@ -1,3 +1,2 @@
 cf-custom-resources/node_modules
-bin
-.idea
+.idea

Dockerfile

@@ -8,4 +8,4 @@ RUN apt-get update && apt-get install -y nodejs
 WORKDIR /aws-amazon-ecs-cli-v2
 COPY . .
 RUN go env -w GOPROXY=direct
-RUN make release
+RUN make release

Makefile

@@ -23,6 +23,9 @@ all: build
 .PHONY: build
 build: packr-build compile-local packr-clean
 
+.PHONY: build-e2e
+build-e2e: packr-build compile-linux packr-clean
+
 .PHONY: release
 release: packr-build compile-darwin compile-linux compile-windows packr-clean
 
@@ -99,17 +102,12 @@ run-integ-test:
 	# and runs tests which end in Integration.
 	go test -v -count=1 -timeout 60m -tags=integration ${PACKAGES}
 
-.PHONY: e2e-test
-e2e-test: build
-	# the target assumes the AWS-* environment variables are exported
-	# -p: The number of test binaries that can be run in parallel
-	# -parallel: Within a single test binary, how many test functions can run in parallel
-	env -i PATH="$$PATH" GOCACHE=$$(go env GOCACHE) GOPATH=$$(go env GOPATH) GOPROXY=direct \
-	AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
-	AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
-	AWS_SESSION_TOKEN=${AWS_SESSION_TOKEN} \
-	AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \
-	go test -v -p 1 -parallel 1 -tags=e2e ./e2e...
+.PHONY: e2e
+e2e: build-e2e
+	@echo "Building E2E Docker Image" &&\
+	docker build -t ecs-cli-v2/e2e . -f e2e/Dockerfile
+	@echo "Running E2E Tests" &&\
+	docker run --privileged -it -v ${HOME}/.aws:/home/.aws -e "HOME=/home" ecs-cli-v2/e2e:latest
 
 .PHONY: e2e-test-update-golden-files
 e2e-test-update-golden-files:

e2e/Dockerfile

@@ -0,0 +1,25 @@
+FROM golang:1.13
+
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go get -u github.com/onsi/ginkgo/ginkgo && go get -u github.com/onsi/gomega/...
+
+FROM docker:stable-dind
+# Docker needs somewhere to put creds from docker login.
+RUN wget https://github.com/docker/docker-credential-helpers/releases/download/v0.6.0/docker-credential-pass-v0.6.0-amd64.tar.gz && tar -xf docker-credential-pass-v0.6.0-amd64.tar.gz && chmod +x docker-credential-pass &&  mv docker-credential-pass /bin
+ENV DOCKER_HOST=tcp://127.0.0.1:2375
+ENV GOPROXY direct
+
+# Install Go, Git and other dependencies so we can run ginkgo
+RUN apk add --no-cache --virtual .build-deps bash gcc musl-dev openssl go git
+
+# Copy the binary
+ADD bin/local/ecs-preview-amd64 /bin/ecs-preview
+
+# Add the e2e directory and the project go.mod
+ADD e2e/ github.com/aws/amazon-ecs-cli-v2/e2e/
+ADD go.mod github.com/aws/amazon-ecs-cli-v2/
+ADD go.sum github.com/aws/amazon-ecs-cli-v2/
+
+# Startup script which inits dockerd and then runs the e2e tests
+COPY e2e/e2e.sh /bin/
+
+ENTRYPOINT ["/bin/e2e.sh"]

e2e/e2e.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+set -e
+# Start dockerd
+/usr/local/bin/dockerd \
+	--host=unix:///var/run/docker.sock \
+	--host=tcp://127.0.0.1:2375 \
+	--storage-driver=overlay2 &>/var/log/docker.log &
+
+# Wait until dockerd is spun up
+tries=0
+d_timeout=60
+until docker info >/dev/null 2>&1
+do
+	if [ "$tries" -gt "$d_timeout" ]; then
+                cat /var/log/docker.log
+		echo 'Timed out trying to connect to internal docker host.' >&2
+		exit 1
+	fi
+        tries=$(( $tries + 1 ))
+	sleep 1
+done
+
+#Run all the e2e tests
+cd /github.com/aws/amazon-ecs-cli-v2/e2e/ && ginkgo -v -r