瀏覽代碼

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.
Tom Wiesing 4 年之前
父節點
當前提交
6b8cd894da
共有 2 個文件被更改,包括 2 次插入4 次删除
  1. 1 2
      Dockerfile
  2. 1 2
      Dockerfile.alpine

+ 1 - 2
Dockerfile

@@ -1,12 +1,11 @@
 # setup build arguments for version of dependencies to use
 # setup build arguments for version of dependencies to use
 ARG NGINX_VERSION=1.19.3
 ARG NGINX_VERSION=1.19.3
-ARG GO_VERSION=1.14
 
 
 ARG DOCKER_GEN_VERSION=0.7.4
 ARG DOCKER_GEN_VERSION=0.7.4
 ARG FOREGO_VERSION=0.16.1
 ARG FOREGO_VERSION=0.16.1
 
 
 # Use a specific version of golang to build both binaries
 # 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
 # Build docker-gen from scratch
 FROM gobuilder as dockergen
 FROM gobuilder as dockergen

+ 1 - 2
Dockerfile.alpine

@@ -1,12 +1,11 @@
 # setup build arguments for version of dependencies to use
 # setup build arguments for version of dependencies to use
 ARG NGINX_VERSION=1.19.3-alpine
 ARG NGINX_VERSION=1.19.3-alpine
-ARG GO_VERSION=1.14-alpine
 
 
 ARG DOCKER_GEN_VERSION=0.7.4
 ARG DOCKER_GEN_VERSION=0.7.4
 ARG FOREGO_VERSION=0.16.1
 ARG FOREGO_VERSION=0.16.1
 
 
 # Use a specific version of golang to build both binaries
 # 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
 RUN apk add --no-cache git
 
 
 # Build docker-gen from scratch
 # Build docker-gen from scratch