Update golang #15164
Merged
Update golang #15164
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@d1ff31b: Merge pull request docker-library/golang#479 from jnoordsij/add-1.21-release - docker-library/golang@5eba309: Remove 1.19 release - docker-library/golang@b637fdd: Add 1.21 release to replace 1.21-rc
Diff for bf3a634:diff --git a/_bashbrew-cat b/_bashbrew-cat
index be488a8..6670c2e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,149 +1,100 @@
Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit), Johan Euphrosine <[email protected]> (@proppy)
GitRepo: https://github.com/docker-library/golang.git
-Tags: 1.19.12-alpine3.17, 1.19-alpine3.17
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 98e07f7c6bdfe926fa95e18c6defa7aa31b38c1d
-Directory: 1.19/alpine3.17
-
-Tags: 1.19.12-alpine3.18, 1.19-alpine3.18, 1.19.12-alpine, 1.19-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 98e07f7c6bdfe926fa95e18c6defa7aa31b38c1d
-Directory: 1.19/alpine3.18
-
-Tags: 1.19.12-bookworm, 1.19-bookworm
-SharedTags: 1.19.12, 1.19
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 98e07f7c6bdfe926fa95e18c6defa7aa31b38c1d
-Directory: 1.19/bookworm
-
-Tags: 1.19.12-bullseye, 1.19-bullseye
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 98e07f7c6bdfe926fa95e18c6defa7aa31b38c1d
-Directory: 1.19/bullseye
-
-Tags: 1.19.12-nanoserver-1809, 1.19-nanoserver-1809
-SharedTags: 1.19.12-nanoserver, 1.19-nanoserver
-Architectures: windows-amd64
-GitCommit: 98e07f7c6bdfe926fa95e18c6defa7aa31b38c1d
-Directory: 1.19/windows/nanoserver-1809
-Constraints: nanoserver-1809, windowsservercore-1809
-
-Tags: 1.19.12-nanoserver-ltsc2022, 1.19-nanoserver-ltsc2022
-SharedTags: 1.19.12-nanoserver, 1.19-nanoserver
-Architectures: windows-amd64
-GitCommit: 98e07f7c6bdfe926fa95e18c6defa7aa31b38c1d
-Directory: 1.19/windows/nanoserver-ltsc2022
-Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
-
-Tags: 1.19.12-windowsservercore-1809, 1.19-windowsservercore-1809
-SharedTags: 1.19.12-windowsservercore, 1.19-windowsservercore, 1.19.12, 1.19
-Architectures: windows-amd64
-GitCommit: 98e07f7c6bdfe926fa95e18c6defa7aa31b38c1d
-Directory: 1.19/windows/windowsservercore-1809
-Constraints: windowsservercore-1809
-
-Tags: 1.19.12-windowsservercore-ltsc2022, 1.19-windowsservercore-ltsc2022
-SharedTags: 1.19.12-windowsservercore, 1.19-windowsservercore, 1.19.12, 1.19
-Architectures: windows-amd64
-GitCommit: 98e07f7c6bdfe926fa95e18c6defa7aa31b38c1d
-Directory: 1.19/windows/windowsservercore-ltsc2022
-Constraints: windowsservercore-ltsc2022
-
-Tags: 1.20.7-alpine3.17, 1.20-alpine3.17, 1-alpine3.17, alpine3.17
+Tags: 1.20.7-alpine3.17, 1.20-alpine3.17
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 50108f6b1d1fc943f3f1124b267c1256f935b89d
Directory: 1.20/alpine3.17
-Tags: 1.20.7-alpine3.18, 1.20-alpine3.18, 1-alpine3.18, alpine3.18, 1.20.7-alpine, 1.20-alpine, 1-alpine, alpine
+Tags: 1.20.7-alpine3.18, 1.20-alpine3.18, 1.20.7-alpine, 1.20-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 50108f6b1d1fc943f3f1124b267c1256f935b89d
Directory: 1.20/alpine3.18
-Tags: 1.20.7-bookworm, 1.20-bookworm, 1-bookworm, bookworm
-SharedTags: 1.20.7, 1.20, 1, latest
+Tags: 1.20.7-bookworm, 1.20-bookworm
+SharedTags: 1.20.7, 1.20
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: 50108f6b1d1fc943f3f1124b267c1256f935b89d
Directory: 1.20/bookworm
-Tags: 1.20.7-bullseye, 1.20-bullseye, 1-bullseye, bullseye
+Tags: 1.20.7-bullseye, 1.20-bullseye
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: 50108f6b1d1fc943f3f1124b267c1256f935b89d
Directory: 1.20/bullseye
-Tags: 1.20.7-nanoserver-1809, 1.20-nanoserver-1809, 1-nanoserver-1809, nanoserver-1809
-SharedTags: 1.20.7-nanoserver, 1.20-nanoserver, 1-nanoserver, nanoserver
+Tags: 1.20.7-nanoserver-1809, 1.20-nanoserver-1809
+SharedTags: 1.20.7-nanoserver, 1.20-nanoserver
Architectures: windows-amd64
GitCommit: 50108f6b1d1fc943f3f1124b267c1256f935b89d
Directory: 1.20/windows/nanoserver-1809
Constraints: nanoserver-1809, windowsservercore-1809
-Tags: 1.20.7-nanoserver-ltsc2022, 1.20-nanoserver-ltsc2022, 1-nanoserver-ltsc2022, nanoserver-ltsc2022
-SharedTags: 1.20.7-nanoserver, 1.20-nanoserver, 1-nanoserver, nanoserver
+Tags: 1.20.7-nanoserver-ltsc2022, 1.20-nanoserver-ltsc2022
+SharedTags: 1.20.7-nanoserver, 1.20-nanoserver
Architectures: windows-amd64
GitCommit: 50108f6b1d1fc943f3f1124b267c1256f935b89d
Directory: 1.20/windows/nanoserver-ltsc2022
Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
-Tags: 1.20.7-windowsservercore-1809, 1.20-windowsservercore-1809, 1-windowsservercore-1809, windowsservercore-1809
-SharedTags: 1.20.7-windowsservercore, 1.20-windowsservercore, 1-windowsservercore, windowsservercore, 1.20.7, 1.20, 1, latest
+Tags: 1.20.7-windowsservercore-1809, 1.20-windowsservercore-1809
+SharedTags: 1.20.7-windowsservercore, 1.20-windowsservercore, 1.20.7, 1.20
Architectures: windows-amd64
GitCommit: 50108f6b1d1fc943f3f1124b267c1256f935b89d
Directory: 1.20/windows/windowsservercore-1809
Constraints: windowsservercore-1809
-Tags: 1.20.7-windowsservercore-ltsc2022, 1.20-windowsservercore-ltsc2022, 1-windowsservercore-ltsc2022, windowsservercore-ltsc2022
-SharedTags: 1.20.7-windowsservercore, 1.20-windowsservercore, 1-windowsservercore, windowsservercore, 1.20.7, 1.20, 1, latest
+Tags: 1.20.7-windowsservercore-ltsc2022, 1.20-windowsservercore-ltsc2022
+SharedTags: 1.20.7-windowsservercore, 1.20-windowsservercore, 1.20.7, 1.20
Architectures: windows-amd64
GitCommit: 50108f6b1d1fc943f3f1124b267c1256f935b89d
Directory: 1.20/windows/windowsservercore-ltsc2022
Constraints: windowsservercore-ltsc2022
-Tags: 1.21rc4-alpine3.17, 1.21-rc-alpine3.17
+Tags: 1.21.0-alpine3.17, 1.21-alpine3.17, 1-alpine3.17, alpine3.17
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 3a7d300a26ad7a99245232f49cad9d871df60fb5
-Directory: 1.21-rc/alpine3.17
+GitCommit: b637fdd34c14d0629dfb632f57b1d177d5dc40f0
+Directory: 1.21/alpine3.17
-Tags: 1.21rc4-alpine3.18, 1.21-rc-alpine3.18, 1.21rc4-alpine, 1.21-rc-alpine
+Tags: 1.21.0-alpine3.18, 1.21-alpine3.18, 1-alpine3.18, alpine3.18, 1.21.0-alpine, 1.21-alpine, 1-alpine, alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 3a7d300a26ad7a99245232f49cad9d871df60fb5
-Directory: 1.21-rc/alpine3.18
+GitCommit: b637fdd34c14d0629dfb632f57b1d177d5dc40f0
+Directory: 1.21/alpine3.18
-Tags: 1.21rc4-bookworm, 1.21-rc-bookworm
-SharedTags: 1.21rc4, 1.21-rc
+Tags: 1.21.0-bookworm, 1.21-bookworm, 1-bookworm, bookworm
+SharedTags: 1.21.0, 1.21, 1, latest
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 3a7d300a26ad7a99245232f49cad9d871df60fb5
-Directory: 1.21-rc/bookworm
+GitCommit: b637fdd34c14d0629dfb632f57b1d177d5dc40f0
+Directory: 1.21/bookworm
-Tags: 1.21rc4-bullseye, 1.21-rc-bullseye
+Tags: 1.21.0-bullseye, 1.21-bullseye, 1-bullseye, bullseye
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 3a7d300a26ad7a99245232f49cad9d871df60fb5
-Directory: 1.21-rc/bullseye
+GitCommit: b637fdd34c14d0629dfb632f57b1d177d5dc40f0
+Directory: 1.21/bullseye
-Tags: 1.21rc4-nanoserver-1809, 1.21-rc-nanoserver-1809
-SharedTags: 1.21rc4-nanoserver, 1.21-rc-nanoserver
+Tags: 1.21.0-nanoserver-1809, 1.21-nanoserver-1809, 1-nanoserver-1809, nanoserver-1809
+SharedTags: 1.21.0-nanoserver, 1.21-nanoserver, 1-nanoserver, nanoserver
Architectures: windows-amd64
-GitCommit: 3a7d300a26ad7a99245232f49cad9d871df60fb5
-Directory: 1.21-rc/windows/nanoserver-1809
+GitCommit: b637fdd34c14d0629dfb632f57b1d177d5dc40f0
+Directory: 1.21/windows/nanoserver-1809
Constraints: nanoserver-1809, windowsservercore-1809
-Tags: 1.21rc4-nanoserver-ltsc2022, 1.21-rc-nanoserver-ltsc2022
-SharedTags: 1.21rc4-nanoserver, 1.21-rc-nanoserver
+Tags: 1.21.0-nanoserver-ltsc2022, 1.21-nanoserver-ltsc2022, 1-nanoserver-ltsc2022, nanoserver-ltsc2022
+SharedTags: 1.21.0-nanoserver, 1.21-nanoserver, 1-nanoserver, nanoserver
Architectures: windows-amd64
-GitCommit: 3a7d300a26ad7a99245232f49cad9d871df60fb5
-Directory: 1.21-rc/windows/nanoserver-ltsc2022
+GitCommit: b637fdd34c14d0629dfb632f57b1d177d5dc40f0
+Directory: 1.21/windows/nanoserver-ltsc2022
Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
-Tags: 1.21rc4-windowsservercore-1809, 1.21-rc-windowsservercore-1809
-SharedTags: 1.21rc4-windowsservercore, 1.21-rc-windowsservercore, 1.21rc4, 1.21-rc
+Tags: 1.21.0-windowsservercore-1809, 1.21-windowsservercore-1809, 1-windowsservercore-1809, windowsservercore-1809
+SharedTags: 1.21.0-windowsservercore, 1.21-windowsservercore, 1-windowsservercore, windowsservercore, 1.21.0, 1.21, 1, latest
Architectures: windows-amd64
-GitCommit: 3a7d300a26ad7a99245232f49cad9d871df60fb5
-Directory: 1.21-rc/windows/windowsservercore-1809
+GitCommit: b637fdd34c14d0629dfb632f57b1d177d5dc40f0
+Directory: 1.21/windows/windowsservercore-1809
Constraints: windowsservercore-1809
-Tags: 1.21rc4-windowsservercore-ltsc2022, 1.21-rc-windowsservercore-ltsc2022
-SharedTags: 1.21rc4-windowsservercore, 1.21-rc-windowsservercore, 1.21rc4, 1.21-rc
+Tags: 1.21.0-windowsservercore-ltsc2022, 1.21-windowsservercore-ltsc2022, 1-windowsservercore-ltsc2022, windowsservercore-ltsc2022
+SharedTags: 1.21.0-windowsservercore, 1.21-windowsservercore, 1-windowsservercore, windowsservercore, 1.21.0, 1.21, 1, latest
Architectures: windows-amd64
-GitCommit: 3a7d300a26ad7a99245232f49cad9d871df60fb5
-Directory: 1.21-rc/windows/windowsservercore-ltsc2022
+GitCommit: b637fdd34c14d0629dfb632f57b1d177d5dc40f0
+Directory: 1.21/windows/windowsservercore-ltsc2022
Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index 481be79..e2d6a58 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -10,30 +10,6 @@ golang:1-nanoserver-ltsc2022
golang:1-windowsservercore
golang:1-windowsservercore-1809
golang:1-windowsservercore-ltsc2022
-golang:1.19
-golang:1.19-alpine
-golang:1.19-alpine3.17
-golang:1.19-alpine3.18
-golang:1.19-bookworm
-golang:1.19-bullseye
-golang:1.19-nanoserver
-golang:1.19-nanoserver-1809
-golang:1.19-nanoserver-ltsc2022
-golang:1.19-windowsservercore
-golang:1.19-windowsservercore-1809
-golang:1.19-windowsservercore-ltsc2022
-golang:1.19.12
-golang:1.19.12-alpine
-golang:1.19.12-alpine3.17
-golang:1.19.12-alpine3.18
-golang:1.19.12-bookworm
-golang:1.19.12-bullseye
-golang:1.19.12-nanoserver
-golang:1.19.12-nanoserver-1809
-golang:1.19.12-nanoserver-ltsc2022
-golang:1.19.12-windowsservercore
-golang:1.19.12-windowsservercore-1809
-golang:1.19.12-windowsservercore-ltsc2022
golang:1.20
golang:1.20-alpine
golang:1.20-alpine3.17
@@ -58,30 +34,30 @@ golang:1.20.7-nanoserver-ltsc2022
golang:1.20.7-windowsservercore
golang:1.20.7-windowsservercore-1809
golang:1.20.7-windowsservercore-ltsc2022
-golang:1.21rc4
-golang:1.21rc4-alpine
-golang:1.21rc4-alpine3.17
-golang:1.21rc4-alpine3.18
-golang:1.21rc4-bookworm
-golang:1.21rc4-bullseye
-golang:1.21rc4-nanoserver
-golang:1.21rc4-nanoserver-1809
-golang:1.21rc4-nanoserver-ltsc2022
-golang:1.21rc4-windowsservercore
-golang:1.21rc4-windowsservercore-1809
-golang:1.21rc4-windowsservercore-ltsc2022
-golang:1.21-rc
-golang:1.21-rc-alpine
-golang:1.21-rc-alpine3.17
-golang:1.21-rc-alpine3.18
-golang:1.21-rc-bookworm
-golang:1.21-rc-bullseye
-golang:1.21-rc-nanoserver
-golang:1.21-rc-nanoserver-1809
-golang:1.21-rc-nanoserver-ltsc2022
-golang:1.21-rc-windowsservercore
-golang:1.21-rc-windowsservercore-1809
-golang:1.21-rc-windowsservercore-ltsc2022
+golang:1.21
+golang:1.21-alpine
+golang:1.21-alpine3.17
+golang:1.21-alpine3.18
+golang:1.21-bookworm
+golang:1.21-bullseye
+golang:1.21-nanoserver
+golang:1.21-nanoserver-1809
+golang:1.21-nanoserver-ltsc2022
+golang:1.21-windowsservercore
+golang:1.21-windowsservercore-1809
+golang:1.21-windowsservercore-ltsc2022
+golang:1.21.0
+golang:1.21.0-alpine
+golang:1.21.0-alpine3.17
+golang:1.21.0-alpine3.18
+golang:1.21.0-bookworm
+golang:1.21.0-bullseye
+golang:1.21.0-nanoserver
+golang:1.21.0-nanoserver-1809
+golang:1.21.0-nanoserver-ltsc2022
+golang:1.21.0-windowsservercore
+golang:1.21.0-windowsservercore-1809
+golang:1.21.0-windowsservercore-ltsc2022
golang:alpine
golang:alpine3.17
golang:alpine3.18
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 8867398..e377312 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,24 +1,16 @@
-golang:1.19-alpine3.17
-golang:1.19-alpine
-golang:1.19-bookworm
-golang:1.19-bullseye
-golang:1.19-windowsservercore-1809
-golang:1.19-windowsservercore-ltsc2022
+golang:1.20-alpine3.17
+golang:1.20-alpine
+golang:1.20-bookworm
+golang:1.20-bullseye
+golang:1.20-windowsservercore-1809
+golang:1.20-windowsservercore-ltsc2022
golang:alpine3.17
golang:alpine
golang:bookworm
golang:bullseye
golang:windowsservercore-1809
golang:windowsservercore-ltsc2022
-golang:1.21-rc-alpine3.17
-golang:1.21-rc-alpine
-golang:1.21-rc-bookworm
-golang:1.21-rc-bullseye
-golang:1.21-rc-windowsservercore-1809
-golang:1.21-rc-windowsservercore-ltsc2022
-golang:1.19-nanoserver-1809
-golang:1.19-nanoserver-ltsc2022
+golang:1.20-nanoserver-1809
+golang:1.20-nanoserver-ltsc2022
golang:nanoserver-1809
golang:nanoserver-ltsc2022
-golang:1.21-rc-nanoserver-1809
-golang:1.21-rc-nanoserver-ltsc2022
diff --git a/golang_1.19-alpine/Dockerfile b/golang_1.19-alpine/Dockerfile
deleted file mode 100644
index e43ffb1..0000000
diff --git a/golang_1.19-alpine3.17/Dockerfile b/golang_1.19-alpine3.17/Dockerfile
deleted file mode 100644
index d1fc611..0000000
diff --git a/golang_1.19-bookworm/Dockerfile b/golang_1.19-bookworm/Dockerfile
deleted file mode 100644
index cd45b0e..0000000
diff --git a/golang_1.19-bullseye/Dockerfile b/golang_1.19-bullseye/Dockerfile
deleted file mode 100644
index f233c37..0000000
diff --git a/golang_1.19-nanoserver-1809/Dockerfile b/golang_1.19-nanoserver-1809/Dockerfile
deleted file mode 100644
index f026136..0000000
diff --git a/golang_1.19-nanoserver-ltsc2022/Dockerfile b/golang_1.19-nanoserver-ltsc2022/Dockerfile
deleted file mode 100644
index c271e68..0000000
diff --git a/golang_1.19-windowsservercore-1809/Dockerfile b/golang_1.19-windowsservercore-1809/Dockerfile
deleted file mode 100644
index e216383..0000000
diff --git a/golang_1.19-windowsservercore-ltsc2022/Dockerfile b/golang_1.19-windowsservercore-ltsc2022/Dockerfile
deleted file mode 100644
index c1eeefb..0000000
diff --git a/golang_alpine/Dockerfile b/golang_1.20-alpine/Dockerfile
similarity index 100%
copy from golang_alpine/Dockerfile
copy to golang_1.20-alpine/Dockerfile
diff --git a/golang_alpine3.17/Dockerfile b/golang_1.20-alpine3.17/Dockerfile
similarity index 100%
copy from golang_alpine3.17/Dockerfile
copy to golang_1.20-alpine3.17/Dockerfile
diff --git a/golang_bookworm/Dockerfile b/golang_1.20-bookworm/Dockerfile
similarity index 100%
copy from golang_bookworm/Dockerfile
copy to golang_1.20-bookworm/Dockerfile
diff --git a/golang_bullseye/Dockerfile b/golang_1.20-bullseye/Dockerfile
similarity index 100%
copy from golang_bullseye/Dockerfile
copy to golang_1.20-bullseye/Dockerfile
diff --git a/golang_nanoserver-1809/Dockerfile b/golang_1.20-nanoserver-1809/Dockerfile
similarity index 100%
copy from golang_nanoserver-1809/Dockerfile
copy to golang_1.20-nanoserver-1809/Dockerfile
diff --git a/golang_nanoserver-ltsc2022/Dockerfile b/golang_1.20-nanoserver-ltsc2022/Dockerfile
similarity index 100%
copy from golang_nanoserver-ltsc2022/Dockerfile
copy to golang_1.20-nanoserver-ltsc2022/Dockerfile
diff --git a/golang_windowsservercore-1809/Dockerfile b/golang_1.20-windowsservercore-1809/Dockerfile
similarity index 100%
copy from golang_windowsservercore-1809/Dockerfile
copy to golang_1.20-windowsservercore-1809/Dockerfile
diff --git a/golang_windowsservercore-ltsc2022/Dockerfile b/golang_1.20-windowsservercore-ltsc2022/Dockerfile
similarity index 100%
copy from golang_windowsservercore-ltsc2022/Dockerfile
copy to golang_1.20-windowsservercore-ltsc2022/Dockerfile
diff --git a/golang_1.21-rc-alpine/Dockerfile b/golang_1.21-rc-alpine/Dockerfile
deleted file mode 100644
index 1d20919..0000000
diff --git a/golang_1.21-rc-alpine3.17/Dockerfile b/golang_1.21-rc-alpine3.17/Dockerfile
deleted file mode 100644
index 50a08b7..0000000
diff --git a/golang_1.21-rc-bookworm/Dockerfile b/golang_1.21-rc-bookworm/Dockerfile
deleted file mode 100644
index 5fb5672..0000000
diff --git a/golang_1.21-rc-bullseye/Dockerfile b/golang_1.21-rc-bullseye/Dockerfile
deleted file mode 100644
index 61ddbba..0000000
diff --git a/golang_1.21-rc-nanoserver-1809/Dockerfile b/golang_1.21-rc-nanoserver-1809/Dockerfile
deleted file mode 100644
index 8f74e9d..0000000
diff --git a/golang_1.21-rc-nanoserver-ltsc2022/Dockerfile b/golang_1.21-rc-nanoserver-ltsc2022/Dockerfile
deleted file mode 100644
index e25c731..0000000
diff --git a/golang_1.21-rc-windowsservercore-1809/Dockerfile b/golang_1.21-rc-windowsservercore-1809/Dockerfile
deleted file mode 100644
index 24708bb..0000000
diff --git a/golang_1.21-rc-windowsservercore-ltsc2022/Dockerfile b/golang_1.21-rc-windowsservercore-ltsc2022/Dockerfile
deleted file mode 100644
index b6d50da..0000000
diff --git a/golang_alpine/Dockerfile b/golang_alpine/Dockerfile
index 8461456..9433eb7 100644
--- a/golang_alpine/Dockerfile
+++ b/golang_alpine/Dockerfile
@@ -10,7 +10,7 @@ RUN apk add --no-cache ca-certificates
ENV PATH /usr/local/go/bin:$PATH
-ENV GOLANG_VERSION 1.20.7
+ENV GOLANG_VERSION 1.21.0
RUN set -eux; \
apk add --no-cache --virtual .fetch-deps gnupg; \
@@ -18,28 +18,36 @@ RUN set -eux; \
url=; \
case "$arch" in \
'x86_64') \
- export GOAMD64='v1' GOARCH='amd64' GOOS='linux'; \
+ url='https://dl.google.com/go/go1.21.0.linux-amd64.tar.gz'; \
+ sha256='d0398903a16ba2232b389fb31032ddf57cac34efda306a0eebac34f0965a0742'; \
;; \
'armhf') \
- export GOARCH='arm' GOARM='6' GOOS='linux'; \
+ url='https://dl.google.com/go/go1.21.0.linux-armv6l.tar.gz'; \
+ sha256='e377a0004957c8c560a3ff99601bce612330a3d95ba3b0a2ae144165fc87deb1'; \
;; \
'armv7') \
- export GOARCH='arm' GOARM='7' GOOS='linux'; \
+ url='https://dl.google.com/go/go1.21.0.linux-armv6l.tar.gz'; \
+ sha256='e377a0004957c8c560a3ff99601bce612330a3d95ba3b0a2ae144165fc87deb1'; \
;; \
'aarch64') \
- export GOARCH='arm64' GOOS='linux'; \
+ url='https://dl.google.com/go/go1.21.0.linux-arm64.tar.gz'; \
+ sha256='f3d4548edf9b22f26bbd49720350bbfe59d75b7090a1a2bff1afad8214febaf3'; \
;; \
'x86') \
- export GO386='softfloat' GOARCH='386' GOOS='linux'; \
+ url='https://dl.google.com/go/go1.21.0.linux-386.tar.gz'; \
+ sha256='0e6f378d9b072fab0a3d9ff4d5e990d98487d47252dba8160015a61e6bd0bcba'; \
;; \
'ppc64le') \
- export GOARCH='ppc64le' GOOS='linux'; \
+ url='https://dl.google.com/go/go1.21.0.linux-ppc64le.tar.gz'; \
+ sha256='e938ffc81d8ebe5efc179240960ba22da6a841ff05d5cab7ce2547112b14a47f'; \
;; \
'riscv64') \
- export GOARCH='riscv64' GOOS='linux'; \
+ url='https://dl.google.com/go/go1.21.0.linux-riscv64.tar.gz'; \
+ sha256='87b21c06573617842ca9e00b954bc9f534066736a0778eae594ac54b45a9e8b7'; \
;; \
's390x') \
- export GOARCH='s390x' GOOS='linux'; \
+ url='https://dl.google.com/go/go1.21.0.linux-s390x.tar.gz'; \
+ sha256='be7338df8e5d5472dfa307b0df2b446d85d001b0a2a3cdb1a14048d751b70481'; \
;; \
*) echo >&2 "error: unsupported architecture '$arch' (likely packaging update needed)"; exit 1 ;; \
esac; \
@@ -47,9 +55,11 @@ RUN set -eux; \
if [ -z "$url" ]; then \
# https://github.com/golang/go/issues/38536#issuecomment-616897960
build=1; \
- url='https://dl.google.com/go/go1.20.7.src.tar.gz'; \
- sha256='2c5ee9c9ec1e733b0dbbc2bdfed3f62306e51d8172bf38f4f4e542b27520f597'; \
-# the precompiled binaries published by Go upstream are not compatible with Alpine, so we always build from source here 😅
+ url='https://dl.google.com/go/go1.21.0.src.tar.gz'; \
+ sha256='818d46ede85682dd551ad378ef37a4d247006f12ec59b5b755601d2ce114369a'; \
+ echo >&2; \
+ echo >&2 "warning: current architecture ($arch) does not have a compatible Go binary release; will be building from source"; \
+ echo >&2; \
fi; \
\
wget -O go.tgz.asc "$url.asc"; \
diff --git a/golang_alpine3.17/Dockerfile b/golang_alpine3.17/Dockerfile
index 0381201..12ee268 100644
--- a/golang_alpine3.17/Dockerfile
+++ b/golang_alpine3.17/Dockerfile
@@ -10,7 +10,7 @@ RUN apk add --no-cache ca-certificates
ENV PATH /usr/local/go/bin:$PATH
-ENV GOLANG_VERSION 1.20.7
+ENV GOLANG_VERSION 1.21.0
RUN set -eux; \
apk add --no-cache --virtual .fetch-deps gnupg; \
@@ -18,28 +18,36 @@ RUN set -eux; \
url=; \
case "$arch" in \
'x86_64') \
- export GOAMD64='v1' GOARCH='amd64' GOOS='linux'; \
+ url='https://dl.google.com/go/go1.21.0.linux-amd64.tar.gz'; \
+ sha256='d0398903a16ba2232b389fb31032ddf57cac34efda306a0eebac34f0965a0742'; \
;; \
'armhf') \
- export GOARCH='arm' GOARM='6' GOOS='linux'; \
+ url='https://dl.google.com/go/go1.21.0.linux-armv6l.tar.gz'; \
+ sha256='e377a0004957c8c560a3ff99601bce612330a3d95ba3b0a2ae144165fc87deb1'; \
;; \
'armv7') \
- export GOARCH='arm' GOARM='7' GOOS='linux'; \
+ url='https://dl.google.com/go/go1.21.0.linux-armv6l.tar.gz'; \
+ sha256='e377a0004957c8c560a3ff99601bce612330a3d95ba3b0a2ae144165fc87deb1'; \
;; \
'aarch64') \
- export GOARCH='arm64' GOOS='linux'; \
+ url='https://dl.google.com/go/go1.21.0.linux-arm64.tar.gz'; \
+ sha256='f3d4548edf9b22f26bbd49720350bbfe59d75b7090a1a2bff1afad8214febaf3'; \
;; \
'x86') \
- export GO386='softfloat' GOARCH='386' GOOS='linux'; \
+ url='https://dl.google.com/go/go1.21.0.linux-386.tar.gz'; \
+ sha256='0e6f378d9b072fab0a3d9ff4d5e990d98487d47252dba8160015a61e6bd0bcba'; \
;; \
'ppc64le') \
- export GOARCH='ppc64le' GOOS='linux'; \
+ url='https://dl.google.com/go/go1.21.0.linux-ppc64le.tar.gz'; \
+ sha256='e938ffc81d8ebe5efc179240960ba22da6a841ff05d5cab7ce2547112b14a47f'; \
;; \
'riscv64') \
- export GOARCH='riscv64' GOOS='linux'; \
+ url='https://dl.google.com/go/go1.21.0.linux-riscv64.tar.gz'; \
+ sha256='87b21c06573617842ca9e00b954bc9f534066736a0778eae594ac54b45a9e8b7'; \
;; \
's390x') \
- export GOARCH='s390x' GOOS='linux'; \
+ url='https://dl.google.com/go/go1.21.0.linux-s390x.tar.gz'; \
+ sha256='be7338df8e5d5472dfa307b0df2b446d85d001b0a2a3cdb1a14048d751b70481'; \
;; \
*) echo >&2 "error: unsupported architecture '$arch' (likely packaging update needed)"; exit 1 ;; \
esac; \
@@ -47,9 +55,11 @@ RUN set -eux; \
if [ -z "$url" ]; then \
# https://github.com/golang/go/issues/38536#issuecomment-616897960
build=1; \
- url='https://dl.google.com/go/go1.20.7.src.tar.gz'; \
- sha256='2c5ee9c9ec1e733b0dbbc2bdfed3f62306e51d8172bf38f4f4e542b27520f597'; \
-# the precompiled binaries published by Go upstream are not compatible with Alpine, so we always build from source here 😅
+ url='https://dl.google.com/go/go1.21.0.src.tar.gz'; \
+ sha256='818d46ede85682dd551ad378ef37a4d247006f12ec59b5b755601d2ce114369a'; \
+ echo >&2; \
+ echo >&2 "warning: current architecture ($arch) does not have a compatible Go binary release; will be building from source"; \
+ echo >&2; \
fi; \
\
wget -O go.tgz.asc "$url.asc"; \
diff --git a/golang_bookworm/Dockerfile b/golang_bookworm/Dockerfile
index 1e0db11..28d1ef7 100644
--- a/golang_bookworm/Dockerfile
+++ b/golang_bookworm/Dockerfile
@@ -20,44 +20,46 @@ RUN set -eux; \
ENV PATH /usr/local/go/bin:$PATH
-ENV GOLANG_VERSION 1.20.7
+ENV GOLANG_VERSION 1.21.0
RUN set -eux; \
arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \
url=; \
case "$arch" in \
'amd64') \
- url='https://dl.google.com/go/go1.20.7.linux-amd64.tar.gz'; \
- sha256='f0a87f1bcae91c4b69f8dc2bc6d7e6bfcd7524fceec130af525058c0c17b1b44'; \
+ url='https://dl.google.com/go/go1.21.0.linux-amd64.tar.gz'; \
+ sha256='d0398903a16ba2232b389fb31032ddf57cac34efda306a0eebac34f0965a0742'; \
;; \
'armel') \
export GOARCH='arm' GOARM='5' GOOS='linux'; \
;; \
'armhf') \
- url='https://dl.google.com/go/go1.20.7.linux-armv6l.tar.gz'; \
- sha256='7cc231b415b94f2f7065870a73f67dd2b0ec12b5a98052b7ee0121c42bc04f8d'; \
+ url='https://dl.google.com/go/go1.21.0.linux-armv6l.tar.gz'; \
+ sha256='e377a0004957c8c560a3ff99601bce612330a3d95ba3b0a2ae144165fc87deb1'; \
;; \
'arm64') \
- url='https://dl.google.com/go/go1.20.7.linux-arm64.tar.gz'; \
- sha256='44781ae3b153c3b07651d93b6bc554e835a36e2d72a696281c1e4dad9efffe43'; \
+ url='https://dl.google.com/go/go1.21.0.linux-arm64.tar.gz'; \
+ sha256='f3d4548edf9b22f26bbd49720350bbfe59d75b7090a1a2bff1afad8214febaf3'; \
;; \
'i386') \
- url='https://dl.google.com/go/go1.20.7.linux-386.tar.gz'; \
- sha256='ddb48145f05bda2f4617a22c979d4e94b22802cdb1a1fde1b1974e733b26f091'; \
+ url='https://dl.google.com/go/go1.21.0.linux-386.tar.gz'; \
+ sha256='0e6f378d9b072fab0a3d9ff4d5e990d98487d47252dba8160015a61e6bd0bcba'; \
;; \
'mips64el') \
- export GOARCH='mips64le' GOOS='linux'; \
+ url='https://dl.google.com/go/go1.21.0.linux-mips64le.tar.gz'; \
+ sha256='92f7933d997c589b4f506c6b3cc5b27ff43b294c3a2d40bf4d7eeaf375f92afb'; \
;; \
'ppc64el') \
- url='https://dl.google.com/go/go1.20.7.linux-ppc64le.tar.gz'; \
- sha256='6318a1db307c12b8afe68808bd6fae4fba1e558a85b958216096869ed506dcb3'; \
+ url='https://dl.google.com/go/go1.21.0.linux-ppc64le.tar.gz'; \
+ sha256='e938ffc81d8ebe5efc179240960ba22da6a841ff05d5cab7ce2547112b14a47f'; \
;; \
'riscv64') \
- export GOARCH='riscv64' GOOS='linux'; \
+ url='https://dl.google.com/go/go1.21.0.linux-riscv64.tar.gz'; \
+ sha256='87b21c06573617842ca9e00b954bc9f534066736a0778eae594ac54b45a9e8b7'; \
;; \
's390x') \
- url='https://dl.google.com/go/go1.20.7.linux-s390x.tar.gz'; \
- sha256='26aea2ede8722ceecbd9db883328a8d963136fd96c11dacc356c44c4c19c6515'; \
+ url='https://dl.google.com/go/go1.21.0.linux-s390x.tar.gz'; \
+ sha256='be7338df8e5d5472dfa307b0df2b446d85d001b0a2a3cdb1a14048d751b70481'; \
;; \
*) echo >&2 "error: unsupported architecture '$arch' (likely packaging update needed)"; exit 1 ;; \
esac; \
@@ -65,8 +67,8 @@ RUN set -eux; \
if [ -z "$url" ]; then \
# https://github.com/golang/go/issues/38536#issuecomment-616897960
build=1; \
- url='https://dl.google.com/go/go1.20.7.src.tar.gz'; \
- sha256='2c5ee9c9ec1e733b0dbbc2bdfed3f62306e51d8172bf38f4f4e542b27520f597'; \
+ url='https://dl.google.com/go/go1.21.0.src.tar.gz'; \
+ sha256='818d46ede85682dd551ad378ef37a4d247006f12ec59b5b755601d2ce114369a'; \
echo >&2; \
echo >&2 "warning: current architecture ($arch) does not have a compatible Go binary release; will be building from source"; \
echo >&2; \
diff --git a/golang_bullseye/Dockerfile b/golang_bullseye/Dockerfile
index a58e356..ae08da0 100644
--- a/golang_bullseye/Dockerfile
+++ b/golang_bullseye/Dockerfile
@@ -20,44 +20,46 @@ RUN set -eux; \
ENV PATH /usr/local/go/bin:$PATH
-ENV GOLANG_VERSION 1.20.7
+ENV GOLANG_VERSION 1.21.0
RUN set -eux; \
arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \
url=; \
case "$arch" in \
'amd64') \
- url='https://dl.google.com/go/go1.20.7.linux-amd64.tar.gz'; \
- sha256='f0a87f1bcae91c4b69f8dc2bc6d7e6bfcd7524fceec130af525058c0c17b1b44'; \
+ url='https://dl.google.com/go/go1.21.0.linux-amd64.tar.gz'; \
+ sha256='d0398903a16ba2232b389fb31032ddf57cac34efda306a0eebac34f0965a0742'; \
;; \
'armel') \
export GOARCH='arm' GOARM='5' GOOS='linux'; \
;; \
'armhf') \
- url='https://dl.google.com/go/go1.20.7.linux-armv6l.tar.gz'; \
- sha256='7cc231b415b94f2f7065870a73f67dd2b0ec12b5a98052b7ee0121c42bc04f8d'; \
+ url='https://dl.google.com/go/go1.21.0.linux-armv6l.tar.gz'; \
+ sha256='e377a0004957c8c560a3ff99601bce612330a3d95ba3b0a2ae144165fc87deb1'; \
;; \
'arm64') \
- url='https://dl.google.com/go/go1.20.7.linux-arm64.tar.gz'; \
- sha256='44781ae3b153c3b07651d93b6bc554e835a36e2d72a696281c1e4dad9efffe43'; \
+ url='https://dl.google.com/go/go1.21.0.linux-arm64.tar.gz'; \
+ sha256='f3d4548edf9b22f26bbd49720350bbfe59d75b7090a1a2bff1afad8214febaf3'; \
;; \
'i386') \
- url='https://dl.google.com/go/go1.20.7.linux-386.tar.gz'; \
- sha256='ddb48145f05bda2f4617a22c979d4e94b22802cdb1a1fde1b1974e733b26f091'; \
+ url='https://dl.google.com/go/go1.21.0.linux-386.tar.gz'; \
+ sha256='0e6f378d9b072fab0a3d9ff4d5e990d98487d47252dba8160015a61e6bd0bcba'; \
;; \
'mips64el') \
- export GOARCH='mips64le' GOOS='linux'; \
+ url='https://dl.google.com/go/go1.21.0.linux-mips64le.tar.gz'; \
+ sha256='92f7933d997c589b4f506c6b3cc5b27ff43b294c3a2d40bf4d7eeaf375f92afb'; \
;; \
'ppc64el') \
- url='https://dl.google.com/go/go1.20.7.linux-ppc64le.tar.gz'; \
- sha256='6318a1db307c12b8afe68808bd6fae4fba1e558a85b958216096869ed506dcb3'; \
+ url='https://dl.google.com/go/go1.21.0.linux-ppc64le.tar.gz'; \
+ sha256='e938ffc81d8ebe5efc179240960ba22da6a841ff05d5cab7ce2547112b14a47f'; \
;; \
'riscv64') \
- export GOARCH='riscv64' GOOS='linux'; \
+ url='https://dl.google.com/go/go1.21.0.linux-riscv64.tar.gz'; \
+ sha256='87b21c06573617842ca9e00b954bc9f534066736a0778eae594ac54b45a9e8b7'; \
;; \
's390x') \
- url='https://dl.google.com/go/go1.20.7.linux-s390x.tar.gz'; \
- sha256='26aea2ede8722ceecbd9db883328a8d963136fd96c11dacc356c44c4c19c6515'; \
+ url='https://dl.google.com/go/go1.21.0.linux-s390x.tar.gz'; \
+ sha256='be7338df8e5d5472dfa307b0df2b446d85d001b0a2a3cdb1a14048d751b70481'; \
;; \
*) echo >&2 "error: unsupported architecture '$arch' (likely packaging update needed)"; exit 1 ;; \
esac; \
@@ -65,8 +67,8 @@ RUN set -eux; \
if [ -z "$url" ]; then \
# https://github.com/golang/go/issues/38536#issuecomment-616897960
build=1; \
- url='https://dl.google.com/go/go1.20.7.src.tar.gz'; \
- sha256='2c5ee9c9ec1e733b0dbbc2bdfed3f62306e51d8172bf38f4f4e542b27520f597'; \
+ url='https://dl.google.com/go/go1.21.0.src.tar.gz'; \
+ sha256='818d46ede85682dd551ad378ef37a4d247006f12ec59b5b755601d2ce114369a'; \
echo >&2; \
echo >&2 "warning: current architecture ($arch) does not have a compatible Go binary release; will be building from source"; \
echo >&2; \
diff --git a/golang_nanoserver-1809/Dockerfile b/golang_nanoserver-1809/Dockerfile
index 14bcc58..a3d4fc2 100644
--- a/golang_nanoserver-1809/Dockerfile
+++ b/golang_nanoserver-1809/Dockerfile
@@ -21,10 +21,10 @@ RUN setx /m PATH "%GOPATH%\bin;C:\Program Files\Go\bin;%PATH%"
USER ContainerUser
# doing this first to share cache across versions more aggressively
-ENV GOLANG_VERSION 1.20.7
+ENV GOLANG_VERSION 1.21.0
# Docker's Windows path parsing is absolutely *cursed*; please just trust me on this one -Tianon
-COPY --from=golang:1.20.7-windowsservercore-1809 ["C:\\\\Program Files\\\\Go","C:\\\\Program Files\\\\Go"]
+COPY --from=golang:1.21.0-windowsservercore-1809 ["C:\\\\Program Files\\\\Go","C:\\\\Program Files\\\\Go"]
RUN go version
WORKDIR $GOPATH
diff --git a/golang_nanoserver-ltsc2022/Dockerfile b/golang_nanoserver-ltsc2022/Dockerfile
index 68698b3..739fc90 100644
--- a/golang_nanoserver-ltsc2022/Dockerfile
+++ b/golang_nanoserver-ltsc2022/Dockerfile
@@ -21,10 +21,10 @@ RUN setx /m PATH "%GOPATH%\bin;C:\Program Files\Go\bin;%PATH%"
USER ContainerUser
# doing this first to share cache across versions more aggressively
-ENV GOLANG_VERSION 1.20.7
+ENV GOLANG_VERSION 1.21.0
# Docker's Windows path parsing is absolutely *cursed*; please just trust me on this one -Tianon
-COPY --from=golang:1.20.7-windowsservercore-ltsc2022 ["C:\\\\Program Files\\\\Go","C:\\\\Program Files\\\\Go"]
+COPY --from=golang:1.21.0-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-1809/Dockerfile
index 5d180bd..12a2621 100644
--- a/golang_windowsservercore-1809/Dockerfile
+++ b/golang_windowsservercore-1809/Dockerfile
@@ -53,14 +53,14 @@ RUN $newPath = ('{0}\bin;C:\Program Files\Go\bin;{1}' -f $env:GOPATH, $env:PATH)
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
# doing this first to share cache across versions more aggressively
-ENV GOLANG_VERSION 1.20.7
+ENV GOLANG_VERSION 1.21.0
-RUN $url = 'https://dl.google.com/go/go1.20.7.windows-amd64.zip'; \
+RUN $url = 'https://dl.google.com/go/go1.21.0.windows-amd64.zip'; \
Write-Host ('Downloading {0} ...' -f $url); \
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
Invoke-WebRequest -Uri $url -OutFile 'go.zip'; \
\
- $sha256 = '736dc6c7fcab1c96b682c8c93e38d7e371e62a17d34cb2c37d451a1147f66af9'; \
+ $sha256 = '732121e64e0ecb07c77fdf6cc1bc5ce7b242c2d40d4ac29021ad4c64a08731f6'; \
Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
Write-Host 'FAILED!'; \
diff --git a/golang_windowsservercore-ltsc2022/Dockerfile b/golang_windowsservercore-ltsc2022/Dockerfile
index 1213cbf..ebbbd3b 100644
--- a/golang_windowsservercore-ltsc2022/Dockerfile
+++ b/golang_windowsservercore-ltsc2022/Dockerfile
@@ -53,14 +53,14 @@ RUN $newPath = ('{0}\bin;C:\Program Files\Go\bin;{1}' -f $env:GOPATH, $env:PATH)
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
# doing this first to share cache across versions more aggressively
-ENV GOLANG_VERSION 1.20.7
+ENV GOLANG_VERSION 1.21.0
-RUN $url = 'https://dl.google.com/go/go1.20.7.windows-amd64.zip'; \
+RUN $url = 'https://dl.google.com/go/go1.21.0.windows-amd64.zip'; \
Write-Host ('Downloading {0} ...' -f $url); \
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
Invoke-WebRequest -Uri $url -OutFile 'go.zip'; \
\
- $sha256 = '736dc6c7fcab1c96b682c8c93e38d7e371e62a17d34cb2c37d451a1147f66af9'; \
+ $sha256 = '732121e64e0ecb07c77fdf6cc1bc5ce7b242c2d40d4ac29021ad4c64a08731f6'; \
Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
Write-Host 'FAILED!'; \Relevant Maintainers: |
|
Hi @yosifkit there might be something wrong with the release? The alpine versions of the images appear to be missing for some architectures: The tags on dockerhub appear to be missing any images. |
|
(not a maintainer) I've noticed it takes some time for images to get built and published to Dockerhub. There's a whole FAQ section on this. It seems like some of the ARM images have been published, but amd64, for example, hasn't been built yet |
|
There was a hiccup on triggering dependent images of Alpine (#15156), so those didn't complete yesterday and have filled up the build queue today, so these builds are delayed. I've pushed the |
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: