Skip to content

Commit e940f8f

Browse files
committed
use image args for FROM, use golang-builder
concourse/concourse#6425 Signed-off-by: Alex Suraci <[email protected]>
1 parent babf5a7 commit e940f8f

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,5 +1,8 @@
1+
ARG base_image=alpine:latest
2+
ARG builder_image=concourse/golang-builder
3+
14
# stage: builder
2-
FROM concourse/golang-builder AS builder
5+
FROM ${builder_image} AS builder
36

47
WORKDIR /concourse/docker-image-resource
58
COPY go.mod .
@@ -18,7 +21,7 @@ RUN set -e; \
1821
done
1922

2023
# stage: resource
21-
FROM alpine:edge AS resource
24+
FROM ${base_image} AS resource
2225
RUN apk --no-cache add \
2326
bash \
2427
docker \

dockerfiles/ubuntu/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
ARG base_image
2+
ARG builder_image=concourse/golang-builder
3+
14
# stage: builder
2-
FROM concourse/golang-builder AS builder
5+
FROM ${builder_image} AS builder
36

47
WORKDIR /concourse/docker-image-resource
58
COPY go.mod .
@@ -18,7 +21,7 @@ RUN set -e; \
1821
done
1922

2023
# stage: resource
21-
FROM ubuntu:bionic AS resource
24+
FROM ${base_image} AS resource
2225

2326
# docker hosts their own packages, this steps sets up the repo for apt-get
2427
RUN apt-get update; \

0 commit comments

Comments
 (0)