From 6b8cd894dab7321853c7b25ce6fafca87f5b3d0b Mon Sep 17 00:00:00 2001 From: Tom Wiesing Date: Thu, 1 Apr 2021 13:54:37 +0200 Subject: [PATCH] Hardcode go 1.15.10 for use in Docker Images This commit updates both 'Dockerfile' and 'Dockerfile.alpine' to use 'go.15.10' when building the dependencies. This change was implemented after feedback from @buchdag to be able to use dependabot. --- Dockerfile | 3 +-- Dockerfile.alpine | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index c3e9b41..bf7d4cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,11 @@ # setup build arguments for version of dependencies to use ARG NGINX_VERSION=1.19.3 -ARG GO_VERSION=1.14 ARG DOCKER_GEN_VERSION=0.7.4 ARG FOREGO_VERSION=0.16.1 # Use a specific version of golang to build both binaries -FROM golang:$GO_VERSION as gobuilder +FROM golang:1.15.10 as gobuilder # Build docker-gen from scratch FROM gobuilder as dockergen diff --git a/Dockerfile.alpine b/Dockerfile.alpine index af4e9a0..feb9651 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,12 +1,11 @@ # setup build arguments for version of dependencies to use ARG NGINX_VERSION=1.19.3-alpine -ARG GO_VERSION=1.14-alpine ARG DOCKER_GEN_VERSION=0.7.4 ARG FOREGO_VERSION=0.16.1 # Use a specific version of golang to build both binaries -FROM golang:$GO_VERSION as gobuilder +FROM golang:1.15.10-alpine as gobuilder RUN apk add --no-cache git # Build docker-gen from scratch