Update golang #10796
Merged
Update golang #10796
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/golang@c4120a8: Merge pull request docker-library/golang#386 from fabiang/windowserver-2022 - docker-library/golang@fb3f71b: Added support for Windows Server 2022
Diff for 6b9cd2a:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 16752f9..ea54dbf 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -29,6 +29,13 @@ GitCommit: 4c1da70f967b2b38b254e166e787d017cc9ca351
Directory: 1.16/windows/nanoserver-1809
Constraints: nanoserver-1809, windowsservercore-1809
+Tags: 1.16.7-nanoserver-ltsc2022, 1.16-nanoserver-ltsc2022
+SharedTags: 1.16.7-nanoserver, 1.16-nanoserver
+Architectures: windows-amd64
+GitCommit: fb3f71bc6fec6f7f3680fad5f1d71e0324894b25
+Directory: 1.16/windows/nanoserver-ltsc2022
+Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
+
Tags: 1.16.7-stretch, 1.16-stretch
Architectures: amd64, arm32v7, arm64v8, i386
GitCommit: 4c1da70f967b2b38b254e166e787d017cc9ca351
@@ -48,6 +55,13 @@ GitCommit: 4c1da70f967b2b38b254e166e787d017cc9ca351
Directory: 1.16/windows/windowsservercore-ltsc2016
Constraints: windowsservercore-ltsc2016
+Tags: 1.16.7-windowsservercore-ltsc2022, 1.16-windowsservercore-ltsc2022
+SharedTags: 1.16.7-windowsservercore, 1.16-windowsservercore, 1.16.7, 1.16
+Architectures: windows-amd64
+GitCommit: fb3f71bc6fec6f7f3680fad5f1d71e0324894b25
+Directory: 1.16/windows/windowsservercore-ltsc2022
+Constraints: windowsservercore-ltsc2022
+
Tags: 1.17.0-alpine3.13, 1.17-alpine3.13, 1-alpine3.13, alpine3.13
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 2cd4dab7bd702c7315864c428ba286827d50cda3
@@ -76,6 +90,13 @@ GitCommit: 2cd4dab7bd702c7315864c428ba286827d50cda3
Directory: 1.17/windows/nanoserver-1809
Constraints: nanoserver-1809, windowsservercore-1809
+Tags: 1.17.0-nanoserver-ltsc2022, 1.17-nanoserver-ltsc2022, 1-nanoserver-ltsc2022, nanoserver-ltsc2022
+SharedTags: 1.17.0-nanoserver, 1.17-nanoserver, 1-nanoserver, nanoserver
+Architectures: windows-amd64
+GitCommit: fb3f71bc6fec6f7f3680fad5f1d71e0324894b25
+Directory: 1.17/windows/nanoserver-ltsc2022
+Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
+
Tags: 1.17.0-stretch, 1.17-stretch, 1-stretch, stretch
Architectures: amd64, arm32v7, arm64v8, i386
GitCommit: 2cd4dab7bd702c7315864c428ba286827d50cda3
@@ -94,3 +115,10 @@ Architectures: windows-amd64
GitCommit: 2cd4dab7bd702c7315864c428ba286827d50cda3
Directory: 1.17/windows/windowsservercore-ltsc2016
Constraints: windowsservercore-ltsc2016
+
+Tags: 1.17.0-windowsservercore-ltsc2022, 1.17-windowsservercore-ltsc2022, 1-windowsservercore-ltsc2022, windowsservercore-ltsc2022
+SharedTags: 1.17.0-windowsservercore, 1.17-windowsservercore, 1-windowsservercore, windowsservercore, 1.17.0, 1.17, 1, latest
+Architectures: windows-amd64
+GitCommit: fb3f71bc6fec6f7f3680fad5f1d71e0324894b25
+Directory: 1.17/windows/windowsservercore-ltsc2022
+Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index d736084..d9df7a8 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,10 +6,12 @@ golang:1-bullseye
golang:1-buster
golang:1-nanoserver
golang:1-nanoserver-1809
+golang:1-nanoserver-ltsc2022
golang:1-stretch
golang:1-windowsservercore
golang:1-windowsservercore-1809
golang:1-windowsservercore-ltsc2016
+golang:1-windowsservercore-ltsc2022
golang:1.16
golang:1.16-alpine
golang:1.16-alpine3.13
@@ -18,10 +20,12 @@ golang:1.16-bullseye
golang:1.16-buster
golang:1.16-nanoserver
golang:1.16-nanoserver-1809
+golang:1.16-nanoserver-ltsc2022
golang:1.16-stretch
golang:1.16-windowsservercore
golang:1.16-windowsservercore-1809
golang:1.16-windowsservercore-ltsc2016
+golang:1.16-windowsservercore-ltsc2022
golang:1.16.7
golang:1.16.7-alpine
golang:1.16.7-alpine3.13
@@ -30,10 +34,12 @@ golang:1.16.7-bullseye
golang:1.16.7-buster
golang:1.16.7-nanoserver
golang:1.16.7-nanoserver-1809
+golang:1.16.7-nanoserver-ltsc2022
golang:1.16.7-stretch
golang:1.16.7-windowsservercore
golang:1.16.7-windowsservercore-1809
golang:1.16.7-windowsservercore-ltsc2016
+golang:1.16.7-windowsservercore-ltsc2022
golang:1.17
golang:1.17-alpine
golang:1.17-alpine3.13
@@ -42,10 +48,12 @@ golang:1.17-bullseye
golang:1.17-buster
golang:1.17-nanoserver
golang:1.17-nanoserver-1809
+golang:1.17-nanoserver-ltsc2022
golang:1.17-stretch
golang:1.17-windowsservercore
golang:1.17-windowsservercore-1809
golang:1.17-windowsservercore-ltsc2016
+golang:1.17-windowsservercore-ltsc2022
golang:1.17.0
golang:1.17.0-alpine
golang:1.17.0-alpine3.13
@@ -54,10 +62,12 @@ golang:1.17.0-bullseye
golang:1.17.0-buster
golang:1.17.0-nanoserver
golang:1.17.0-nanoserver-1809
+golang:1.17.0-nanoserver-ltsc2022
golang:1.17.0-stretch
golang:1.17.0-windowsservercore
golang:1.17.0-windowsservercore-1809
golang:1.17.0-windowsservercore-ltsc2016
+golang:1.17.0-windowsservercore-ltsc2022
golang:alpine
golang:alpine3.13
golang:alpine3.14
@@ -66,7 +76,9 @@ golang:buster
golang:latest
golang:nanoserver
golang:nanoserver-1809
+golang:nanoserver-ltsc2022
golang:stretch
golang:windowsservercore
golang:windowsservercore-1809
golang:windowsservercore-ltsc2016
+golang:windowsservercore-ltsc2022
diff --git a/golang_1.16-nanoserver-1809/Dockerfile b/golang_1.16-nanoserver-ltsc2022/Dockerfile
similarity index 86%
copy from golang_1.16-nanoserver-1809/Dockerfile
copy to golang_1.16-nanoserver-ltsc2022/Dockerfile
index f9768c3..635a240 100644
--- a/golang_1.16-nanoserver-1809/Dockerfile
+++ b/golang_1.16-nanoserver-ltsc2022/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM mcr.microsoft.com/windows/nanoserver:1809
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
SHELL ["cmd", "/S", "/C"]
@@ -24,7 +24,7 @@ USER ContainerUser
ENV GOLANG_VERSION 1.16.7
# Docker's Windows path parsing is absolutely *cursed*; please just trust me on this one -Tianon
-COPY --from=golang:1.16.7-windowsservercore-1809 ["C:\\\\go","C:\\\\go"]
+COPY --from=golang:1.16.7-windowsservercore-ltsc2022 ["C:\\\\go","C:\\\\go"]
RUN go version
WORKDIR $GOPATH
diff --git a/golang_1.16-windowsservercore-1809/Dockerfile b/golang_1.16-windowsservercore-ltsc2022/Dockerfile
similarity index 98%
copy from golang_1.16-windowsservercore-1809/Dockerfile
copy to golang_1.16-windowsservercore-ltsc2022/Dockerfile
index 7bc1c74..6f3fd87 100644
--- a/golang_1.16-windowsservercore-1809/Dockerfile
+++ b/golang_1.16-windowsservercore-ltsc2022/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM mcr.microsoft.com/windows/servercore:1809
+FROM mcr.microsoft.com/windows/servercore:ltsc2022
# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
diff --git a/golang_nanoserver-1809/Dockerfile b/golang_nanoserver-ltsc2022/Dockerfile
similarity index 86%
copy from golang_nanoserver-1809/Dockerfile
copy to golang_nanoserver-ltsc2022/Dockerfile
index f919582..5d662ed 100644
--- a/golang_nanoserver-1809/Dockerfile
+++ b/golang_nanoserver-ltsc2022/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM mcr.microsoft.com/windows/nanoserver:1809
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
SHELL ["cmd", "/S", "/C"]
@@ -24,7 +24,7 @@ USER ContainerUser
ENV GOLANG_VERSION 1.17
# Docker's Windows path parsing is absolutely *cursed*; please just trust me on this one -Tianon
-COPY --from=golang:1.17-windowsservercore-1809 ["C:\\\\Program Files\\\\Go","C:\\\\Program Files\\\\Go"]
+COPY --from=golang:1.17-windowsservercore-ltsc2022 ["C:\\\\Program Files\\\\Go","C:\\\\Program Files\\\\Go"]
RUN go version
WORKDIR $GOPATH
diff --git a/golang_windowsservercore-1809/Dockerfile b/golang_windowsservercore-ltsc2022/Dockerfile
similarity index 98%
copy from golang_windowsservercore-1809/Dockerfile
copy to golang_windowsservercore-ltsc2022/Dockerfile
index f45ea71..21eecf3 100644
--- a/golang_windowsservercore-1809/Dockerfile
+++ b/golang_windowsservercore-ltsc2022/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM mcr.microsoft.com/windows/servercore:1809
+FROM mcr.microsoft.com/windows/servercore:ltsc2022
# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: