more work on trying to get alpine linux builds working

Dockerfile

@@ -1,9 +1,19 @@
 FROM alpine:3.4
 
-RUN apk add -U --repository http://dl-3.alpinelinux.org/alpine/edge/community/ go=1.7.1-r0
+#RUN apk add --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/community/ go=1.7.1-r0
 
-COPY . /tmp
+RUN apk add --no-cache binutils curl git
 
-RUN mkdir -p /tmp/go
+RUN cd /tmp && \
+    curl -o go1.7.1.linux-amd64.tar.gz "https://storage.googleapis.com/golang/go1.7.1.linux-amd64.tar.gz" && \
+    tar xzf go1.7.1.linux-amd64.tar.gz && \
+    rm -f go1.7.1.linux-amd64.tar.gz
 
-ENV GOPATH /tmp/go
+RUN mkdir -p /tmp/gopath && \
+    mkdir -p /tmp/ecs-discoverer
+
+ENV PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/tmp/go/bin"
+
+ENV GOPATH "/tmp/gopath"
+
+COPY . /tmp/ecs-discoverer

build_upload.sh

@@ -77,11 +77,12 @@ build_image="ecs_discoverer_build"
 build_container="ecs_discoverer_builder"
 docker build -t "$build_image" .
 docker run -d --name "$build_container" "$build_image" tail -f /dev/null
-docker exec -it "$build_container" sh -c "cd /tmp && go get -d && GOOS=linux GOARCH=amd64 go build"
-docker cp "$build_container:/tmp/tmp" "${DIR}/bin/ecs-discoverer-${new_version}-linux_musl_amd64"
-docker stop -t 1 "$build_container"
-docker rm "$build_container"
-docker rmi "$build_image"
+echo "$(date) : Fetching golang dependencies within container"
+docker exec -it "$build_container" sh -c "cd /tmp/ecs-discoverer && go get -d"
+echo "$(date) : Running go build within container"
+docker exec -it "$build_container" sh -c "cd /tmp/ecs-discoverer && GOOS=linux GOARCH=amd64 go build"
+docker cp "$build_container:/tmp/ecs-discoverer/ecs-discoverer" "${DIR}/bin/ecs-discoverer-${new_version}-linux_musl_amd64"
+trap "echo 'Cleaning up containers/images'; docker stop -t 1 $build_container && docker rm $build_container && docker rmi $build_image" EXIT QUIT TERM
 echo "$(date) : Build for Alpine Linux completed"
 
 # Create git tag