Merge pull request #347 from concourse/image-args

use image args for FROM, use golang-builder

Author: vito

assets/common.sh

@@ -14,7 +14,7 @@ load_pubkey() {
     eval $(ssh-agent) >/dev/null 2>&1
     trap "kill $SSH_AGENT_PID" EXIT
 
-    SSH_ASKPASS=$(dirname $0)/askpass.sh DISPLAY= ssh-add $private_key_path >/dev/null
+    SSH_ASKPASS_REQUIRE=force SSH_ASKPASS=$(dirname $0)/askpass.sh DISPLAY= ssh-add $private_key_path >/dev/null
 
     mkdir -p ~/.ssh
     cat > ~/.ssh/config <<EOF

dockerfiles/alpine/Dockerfile

@@ -1,6 +1,6 @@
-# temporaily use alpine:3 since alpine:edge uses musl-1.2.1 which breaks
-# docker for mac due to (lack of) ipv6 dns resolution
-FROM alpine:3 AS resource
+ARG base_image=alpine:latest
+
+FROM ${base_image} AS resource
 
 RUN apk --no-cache add \
   bash \

dockerfiles/ubuntu/Dockerfile

@@ -1,4 +1,6 @@
-FROM ubuntu:bionic AS resource
+ARG base_image
+
+FROM ${base_image} AS resource
 
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \