From fe2a76c083e92d6e51367c2f4cff1f06707bc900 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Wed, 24 May 2023 14:23:10 +0200 Subject: [PATCH 1/2] app-emulation/docker*: build docker with Go 1.19 Go 1.18 is already EOL, so no security update at all. Since upstream docker projects already have Go 1.19, Flatcar should also have that. See also https://github.com/moby/moby/blob/5d6db842238e3c4f5f9fb9ad70ea46b35227d084/Dockerfile#L6. (cherry picked from commit 93a898312d91ebbf0708c1d96f43cd69e2fd6aed) Signed-off-by: Jeremi Piotrowski Fixes: flatcar/Flatcar#1203 --- .../app-emulation/docker-cli/docker-cli-20.10.24.ebuild | 2 +- .../app-emulation/docker-proxy/docker-proxy-9999.ebuild | 2 +- .../app-emulation/docker-runc/docker-runc-1.1.7.ebuild | 2 +- .../coreos-overlay/app-emulation/docker/docker-20.10.24.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.24.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.24.ebuild index 3bff4d2c15f..0019339512b 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.24.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.24.ebuild @@ -6,7 +6,7 @@ GIT_COMMIT=e78084afe5 EGO_PN="github.com/docker/cli" COREOS_GO_PACKAGE="${EGO_PN}" -COREOS_GO_VERSION="go1.18" +COREOS_GO_VERSION="go1.19" inherit bash-completion-r1 golang-vcs-snapshot coreos-go-depend diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-9999.ebuild index 5646ae3c26e..ed95c359d6c 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-9999.ebuild @@ -5,7 +5,7 @@ EAPI=6 EGO_PN="github.com/docker/libnetwork" COREOS_GO_PACKAGE="${EGO_PN}" -COREOS_GO_VERSION="go1.18" +COREOS_GO_VERSION="go1.19" COREOS_GO_GO111MODULE="off" if [[ ${PV} == *9999 ]]; then diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.1.7.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.1.7.ebuild index d49efa4be88..e1b17c20ac7 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.1.7.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.1.7.ebuild @@ -5,7 +5,7 @@ EAPI=6 GITHUB_URI="github.com/opencontainers/runc" COREOS_GO_PACKAGE="${GITHUB_URI}" -COREOS_GO_VERSION="go1.18" +COREOS_GO_VERSION="go1.19" # the commit of runc that docker uses. # see https://github.com/docker/docker-ce/blob/v19.03.15/components/engine/hack/dockerfile/install/runc.installer#L4 COMMIT_ID="532d81d385677036958916d9aed5dd3431c5edb5" diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.24.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.24.ebuild index 28035af9272..e543861a2d2 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.24.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.24.ebuild @@ -4,7 +4,7 @@ EAPI=7 EGO_PN=github.com/docker/docker GIT_COMMIT=d6cbf44b8c -COREOS_GO_VERSION="go1.18" +COREOS_GO_VERSION="go1.19" COREOS_GO_GO111MODULE="off" inherit bash-completion-r1 linux-info systemd udev golang-vcs-snapshot From 254f77a9f98b5d2a747032c4765d21772d0e80fe Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Mon, 9 Oct 2023 17:22:27 +0200 Subject: [PATCH 2/2] changelog: Add entry for Docker permission issue caused by building with Go <1.19. Signed-off-by: Jeremi Piotrowski --- changelog/bugfixes/2023-10-09-docker-go-1.19.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/bugfixes/2023-10-09-docker-go-1.19.md diff --git a/changelog/bugfixes/2023-10-09-docker-go-1.19.md b/changelog/bugfixes/2023-10-09-docker-go-1.19.md new file mode 100644 index 00000000000..2e50d317758 --- /dev/null +++ b/changelog/bugfixes/2023-10-09-docker-go-1.19.md @@ -0,0 +1 @@ +- Fixed a regression in Docker resulting in file permissions being dropped from exported container images. ([scripts#1231](https://github.com/flatcar/scripts/pull/1231))