Skip to content

Commit

Permalink
app-emulation/docker*: build docker with Go 1.19
Browse files Browse the repository at this point in the history
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 93a8983)
Signed-off-by: Jeremi Piotrowski <[email protected]>
Fixes: flatcar/Flatcar#1203
  • Loading branch information
dongsupark authored and jepio committed Oct 9, 2023
1 parent 994e913 commit fe2a76c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit fe2a76c

Please sign in to comment.