From 93a898312d91ebbf0708c1d96f43cd69e2fd6aed Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Wed, 24 May 2023 14:23:10 +0200 Subject: [PATCH] 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. --- .../app-emulation/docker-cli/docker-cli-20.10.24.ebuild | 2 +- .../docker-proxy/docker-proxy-0.8.0_p20230118.ebuild | 2 +- .../app-emulation/docker-runc/docker-runc-1.1.7.ebuild | 2 +- .../app-emulation/docker/docker-20.10.24-r1.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 3bff4d2c15..0019339512 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-0.8.0_p20230118.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20230118.ebuild index b6ba34429e..bb3ea78ae7 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20230118.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20230118.ebuild @@ -8,7 +8,7 @@ inherit golang-vcs-snapshot # Flatcar: Add coreos go goo. COREOS_GO_PACKAGE="${EGO_PN}" -COREOS_GO_VERSION="go1.18" +COREOS_GO_VERSION="go1.19" COREOS_GO_GO111MODULE="off" inherit coreos-go 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 d49efa4be8..e1b17c20ac 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-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.24-r1.ebuild index 61267209bb..b3fa0038a7 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.24-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.24-r1.ebuild @@ -7,7 +7,7 @@ MY_PV=${PV/_/-} GIT_COMMIT=d6cbf44b8c inherit linux-info systemd udev golang-vcs-snapshot -COREOS_GO_VERSION="go1.18" +COREOS_GO_VERSION="go1.19" COREOS_GO_GO111MODULE="off" inherit coreos-go-depend