From 92905d30e8993980d1018d613ea7cfd0a1c45b94 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Mon, 4 May 2020 12:45:36 +0200 Subject: [PATCH] docker: Accept Go version as --build-arg --- Dockerfile | 3 ++- Dockerfile.builder | 3 ++- Dockerfile.stdiscosrv | 3 ++- Dockerfile.strelaysrv | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 75ebe709c..37076c6cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM golang:1.13 AS builder +ARG GOVERSION=latest +FROM golang:$GOVERSION AS builder WORKDIR /src COPY . . diff --git a/Dockerfile.builder b/Dockerfile.builder index 0319e52f7..edb6323d8 100644 --- a/Dockerfile.builder +++ b/Dockerfile.builder @@ -1,4 +1,5 @@ -FROM golang:1.13 +ARG GOVERSION=latest +FROM golang:$GOVERSION # FPM to build Debian packages RUN apt-get update && apt-get install -y --no-install-recommends \ diff --git a/Dockerfile.stdiscosrv b/Dockerfile.stdiscosrv index 918a71612..2373b7cd9 100644 --- a/Dockerfile.stdiscosrv +++ b/Dockerfile.stdiscosrv @@ -1,4 +1,5 @@ -FROM golang:1.13 AS builder +ARG GOVERSION=latest +FROM golang:$GOVERSION AS builder WORKDIR /src COPY . . diff --git a/Dockerfile.strelaysrv b/Dockerfile.strelaysrv index 8d15984ab..26bbf0098 100644 --- a/Dockerfile.strelaysrv +++ b/Dockerfile.strelaysrv @@ -1,4 +1,5 @@ -FROM golang:1.13 AS builder +ARG GOVERSION=latest +FROM golang:$GOVERSION AS builder WORKDIR /src COPY . .