diff --git a/dockerfiles/alpine/Dockerfile b/dockerfiles/alpine/Dockerfile index 9ecc2bbb..b03dde3f 100644 --- a/dockerfiles/alpine/Dockerfile +++ b/dockerfiles/alpine/Dockerfile @@ -1,4 +1,7 @@ -FROM golang:alpine as builder +ARG base_image=alpine:latest +ARG builder_image=concourse/golang-builder + +FROM ${builder_image} as builder COPY . /go/src/github.com/concourse/s3-resource WORKDIR /go/src/github.com/concourse/s3-resource ENV CGO_ENABLED 0 @@ -10,7 +13,7 @@ RUN set -e; for pkg in $(go list ./...); do \ go test -o "/tests/$(basename $pkg).test" -c $pkg; \ done -FROM alpine:edge AS resource +FROM ${base_image} AS resource RUN apk add --no-cache bash tzdata ca-certificates unzip zip gzip tar COPY --from=builder assets/ /opt/resource/ RUN chmod +x /opt/resource/* diff --git a/dockerfiles/ubuntu/Dockerfile b/dockerfiles/ubuntu/Dockerfile index 590d3d83..5e4fbac9 100644 --- a/dockerfiles/ubuntu/Dockerfile +++ b/dockerfiles/ubuntu/Dockerfile @@ -1,4 +1,7 @@ -FROM concourse/golang-builder as builder +ARG base_image +ARG builder_image=concourse/golang-builder + +FROM ${builder_image} as builder COPY . /go/src/github.com/concourse/s3-resource WORKDIR /go/src/github.com/concourse/s3-resource ENV CGO_ENABLED 0 @@ -10,7 +13,7 @@ RUN set -e; for pkg in $(go list ./...); do \ go test -o "/tests/$(basename $pkg).test" -c $pkg; \ done -FROM ubuntu:bionic AS resource +FROM ${base_image} AS resource RUN apt-get update \ && apt-get install -y --no-install-recommends \ tzdata \