From e940f8fed8c147f8324059fabfcf1b345cfeee2c Mon Sep 17 00:00:00 2001 From: Alex Suraci Date: Wed, 13 Jan 2021 22:14:16 -0500 Subject: [PATCH] use image args for FROM, use golang-builder concourse/concourse#6425 Signed-off-by: Alex Suraci --- dockerfiles/alpine/Dockerfile | 7 +++++-- dockerfiles/ubuntu/Dockerfile | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dockerfiles/alpine/Dockerfile b/dockerfiles/alpine/Dockerfile index bdf65d55..1ed34964 100644 --- 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 index f612d67d..d7cd4f48 100644 --- 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; \