From df7aae9a3af94506ebab90ece0b175672a7cd133 Mon Sep 17 00:00:00 2001 From: Adam Chalkley Date: Mon, 26 Jun 2023 06:06:40 -0500 Subject: [PATCH] Update Dockerfiles to specify chosen base image OS These images were updated to use the most recent stable base image OS available: - mirror images - oldstable images - stable images The bump to Go 1.21rc2 for the unstable images also included the change to specify the base image OS. NOTE: Going forward the base image OS will likely stay the same for the life of the specific series reflected in the image type. For example, Debian "bookworm" was recently released. When Go 1.21.0 is released as the next stable version, the "stable" Debian-based images will continue to use the "bookworm" OS as the base image for the life of the Go 1.21 series. If a newer Debian OS version is available when Go 1.22.0 is released then the "stable" images will adopt that Debian OS as the base image OS for Debian-based images. The 1.21 series will continue to use the former Debian OS as the base image OS (for Debian-based images). refs GH-1057 refs GH-1058 --- README.md | 1 + mirror/1.14/Dockerfile | 2 +- mirror/1.15/Dockerfile | 2 +- mirror/1.16/Dockerfile | 2 +- mirror/1.17/Dockerfile | 2 +- mirror/1.18/Dockerfile | 2 +- mirror/1.19/Dockerfile | 2 +- mirror/1.20/Dockerfile | 2 +- oldstable/build/release/Dockerfile | 2 +- oldstable/combined/Dockerfile | 2 +- stable/build/cgo-mingw-w64/Dockerfile | 2 +- stable/build/release/Dockerfile | 2 +- stable/combined/Dockerfile | 2 +- 13 files changed, 13 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index c44505be..f46b6d0e 100644 --- a/README.md +++ b/README.md @@ -326,3 +326,4 @@ official release is also provided for further review. - - - + - diff --git a/mirror/1.14/Dockerfile b/mirror/1.14/Dockerfile index 94def21f..d0dc599a 100644 --- a/mirror/1.14/Dockerfile +++ b/mirror/1.14/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.14.15 +FROM golang:1.14.15-buster # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/mirror/1.15/Dockerfile b/mirror/1.15/Dockerfile index 033f2ccf..c7d9735c 100644 --- a/mirror/1.15/Dockerfile +++ b/mirror/1.15/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.15.15 +FROM golang:1.15.15-buster # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/mirror/1.16/Dockerfile b/mirror/1.16/Dockerfile index c286b25a..7a8d83b0 100644 --- a/mirror/1.16/Dockerfile +++ b/mirror/1.16/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.16.15 +FROM golang:1.16.15-bullseye # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/mirror/1.17/Dockerfile b/mirror/1.17/Dockerfile index b8a17f93..768f431c 100644 --- a/mirror/1.17/Dockerfile +++ b/mirror/1.17/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.17.13 +FROM golang:1.17.13-bullseye # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/mirror/1.18/Dockerfile b/mirror/1.18/Dockerfile index 4ae52a62..5c869f18 100644 --- a/mirror/1.18/Dockerfile +++ b/mirror/1.18/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.18.10 +FROM golang:1.18.10-bullseye # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/mirror/1.19/Dockerfile b/mirror/1.19/Dockerfile index e144794d..8daf34ba 100644 --- a/mirror/1.19/Dockerfile +++ b/mirror/1.19/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.19.10 +FROM golang:1.19.10-bookworm # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/mirror/1.20/Dockerfile b/mirror/1.20/Dockerfile index 5790bcb9..f8f525e2 100644 --- a/mirror/1.20/Dockerfile +++ b/mirror/1.20/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.20.5 +FROM golang:1.20.5-bookworm # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/oldstable/build/release/Dockerfile b/oldstable/build/release/Dockerfile index 50e54156..32fc7053 100644 --- a/oldstable/build/release/Dockerfile +++ b/oldstable/build/release/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.19.10 +FROM golang:1.19.10-bookworm # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/oldstable/combined/Dockerfile b/oldstable/combined/Dockerfile index fd635cbb..60d1f8db 100644 --- a/oldstable/combined/Dockerfile +++ b/oldstable/combined/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.19.10 +FROM golang:1.19.10-bookworm # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/stable/build/cgo-mingw-w64/Dockerfile b/stable/build/cgo-mingw-w64/Dockerfile index 372ea90c..664c674a 100644 --- a/stable/build/cgo-mingw-w64/Dockerfile +++ b/stable/build/cgo-mingw-w64/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.20.5 +FROM golang:1.20.5-bookworm # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/stable/build/release/Dockerfile b/stable/build/release/Dockerfile index 36c9df4d..0f7447a4 100644 --- a/stable/build/release/Dockerfile +++ b/stable/build/release/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.20.5 +FROM golang:1.20.5-bookworm # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/stable/combined/Dockerfile b/stable/combined/Dockerfile index ab205482..eb69f5d8 100644 --- a/stable/combined/Dockerfile +++ b/stable/combined/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.20.5 +FROM golang:1.20.5-bookworm # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci"