diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild index 4d9d672f93..6b692d8bc0 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild @@ -5,7 +5,7 @@ EAPI=6 GITHUB_URI="github.com/containerd/containerd" COREOS_GO_PACKAGE="${GITHUB_URI}" -COREOS_GO_VERSION="go1.17" +COREOS_GO_VERSION="go1.18" if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://${GITHUB_URI}.git" 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 e9221e635d..5646ae3c26 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.17" +COREOS_GO_VERSION="go1.18" 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.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.1.1.ebuild index c00e5758fc..8513485120 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.1.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.1.1.ebuild @@ -5,7 +5,7 @@ EAPI=6 GITHUB_URI="github.com/opencontainers/runc" COREOS_GO_PACKAGE="${GITHUB_URI}" -COREOS_GO_VERSION="go1.17" +COREOS_GO_VERSION="go1.18" # 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="886750b989c082700828ec1d3bbb1b397219bfac" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r203.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r204.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r203.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r204.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild index a2898826e2..1921b69a3c 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild @@ -37,6 +37,7 @@ RDEPEND="${RDEPEND} dev-lang/go-bootstrap dev-lang/go:1.12 dev-lang/go:1.17 + dev-lang/go:1.18 dev-lang/nasm =dev-lang/python-3* dev-lang/swig diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-depend.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-depend.eclass index da8fced4d5..347fb656d8 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-depend.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-depend.eclass @@ -11,9 +11,9 @@ # # Example: # @CODE -# COREOS_GO_VERSION=go1.17 +# COREOS_GO_VERSION=go1.18 # @CODE -export COREOS_GO_VERSION="${COREOS_GO_VERSION:-go1.17}" +export COREOS_GO_VERSION="${COREOS_GO_VERSION:-go1.18}" case "${EAPI:-0}" in 5|6) DEPEND="dev-lang/go:${COREOS_GO_VERSION#go}=" ;; diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass index 8fc01f685e..da07e4caf6 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass @@ -30,7 +30,7 @@ # # Example: # @CODE -# COREOS_GO_VERSION=go1.17 +# COREOS_GO_VERSION=go1.18 # @CODE case "${EAPI:-0}" in