Merge pull request #298 from dunglas/2.6go1.20

fix: use Go 1.20 for 2.6 builders
caddyserver · May 23, 2023 · c2fe0d6 · c2fe0d6
2 parents a8083a5 + 38f8d57
commit c2fe0d6
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/2.6/builder/Dockerfile b/2.6/builder/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.19-alpine
+FROM golang:1.20-alpine
 
 RUN apk add --no-cache \
 	ca-certificates \

diff --git a/2.6/builder/Dockerfile.base b/2.6/builder/Dockerfile.base
@@ -1 +1 @@
-FROM golang:1.19-alpine
+FROM golang:1.20-alpine
diff --git a/2.6/windows-builder/1809/Dockerfile b/2.6/windows-builder/1809/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.19-windowsservercore-1809
+FROM golang:1.20-windowsservercore-1809
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 

diff --git a/2.6/windows-builder/1809/Dockerfile.base b/2.6/windows-builder/1809/Dockerfile.base
@@ -1 +1 @@
-FROM golang:1.19-windowsservercore-1809
+FROM golang:1.20-windowsservercore-1809
diff --git a/2.6/windows-builder/ltsc2022/Dockerfile b/2.6/windows-builder/ltsc2022/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.19-windowsservercore-ltsc2022
+FROM golang:1.20-windowsservercore-ltsc2022
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 

diff --git a/2.6/windows-builder/ltsc2022/Dockerfile.base b/2.6/windows-builder/ltsc2022/Dockerfile.base
@@ -1 +1 @@
-FROM golang:1.19-windowsservercore-ltsc2022
+FROM golang:1.20-windowsservercore-ltsc2022