Skip to content

Commit 049fb2b

Browse files
committed
use image args for FROM, use golang-builder
concourse/concourse#6425 Signed-off-by: Alex Suraci <suraci.alex@gmail.com>
1 parent c9c668a commit 049fb2b

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

dockerfiles/alpine/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
FROM golang:alpine as builder
1+
ARG base_image=alpine:latest
2+
ARG builder_image=concourse/golang-builder
3+
4+
FROM ${builder_image} as builder
25
COPY . /src
36
WORKDIR /src
47
ENV CGO_ENABLED 0
@@ -10,7 +13,7 @@ RUN set -e; for pkg in $(go list ./...); do \
1013
go test -o "/tests/$(basename $pkg).test" -c $pkg; \
1114
done
1215

13-
FROM alpine:edge AS resource
16+
FROM ${base_image} AS resource
1417
RUN apk add --no-cache bash tzdata ca-certificates git jq openssh
1518
RUN git config --global user.email "git@localhost"
1619
RUN git config --global user.name "git"

dockerfiles/ubuntu/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
FROM concourse/golang-builder as builder
1+
ARG base_image
2+
ARG builder_image=concourse/golang-builder
3+
4+
FROM ${builder_image} as builder
25
COPY . /src
36
WORKDIR /src
47
ENV CGO_ENABLED 0
@@ -10,7 +13,7 @@ RUN set -e; for pkg in $(go list ./...); do \
1013
go test -o "/tests/$(basename $pkg).test" -c $pkg; \
1114
done
1215

13-
FROM ubuntu:bionic AS resource
16+
FROM ${base_image} AS resource
1417
RUN apt-get update \
1518
&& DEBIAN_FRONTEND=noninteractive \
1619
apt-get install -y --no-install-recommends \

0 commit comments

Comments
 (0)