Merge pull request #320 from concourse/image-args

use image args for FROM, use golang-builder
concourse · Jan 14, 2021 · 6a27ae9 · 6a27ae9
2 parents babf5a7 + e940f8f
commit 6a27ae9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/dockerfiles/alpine/Dockerfile b/dockerfiles/alpine/Dockerfile
@@ -1,5 +1,8 @@
+ARG base_image=alpine:latest
+ARG builder_image=concourse/golang-builder
+
 # stage: builder
-FROM concourse/golang-builder AS builder
+FROM ${builder_image} AS builder
 
 WORKDIR /concourse/docker-image-resource
 COPY go.mod .
@@ -18,7 +21,7 @@ RUN set -e; \
     done
 
 # stage: resource
-FROM alpine:edge AS resource
+FROM ${base_image} AS resource
 RUN apk --no-cache add \
       bash \
       docker \

diff --git a/dockerfiles/ubuntu/Dockerfile b/dockerfiles/ubuntu/Dockerfile
@@ -1,5 +1,8 @@
+ARG base_image
+ARG builder_image=concourse/golang-builder
+
 # stage: builder
-FROM concourse/golang-builder AS builder
+FROM ${builder_image} AS builder
 
 WORKDIR /concourse/docker-image-resource
 COPY go.mod .
@@ -18,7 +21,7 @@ RUN set -e; \
     done
 
 # stage: resource
-FROM ubuntu:bionic AS resource
+FROM ${base_image} AS resource
 
 # docker hosts their own packages, this steps sets up the repo for apt-get
 RUN apt-get update; \