mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-15 08:56:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

app-emulation/docker{,-cli}: build with Go 1.18

Browse Source 
Now that the upstream Docker 20.10.18 started building the source
with Go 1.18 instead of 1.17, we should also remove code to force
building with 1.17 and simply build with 1.18.

Otherwise the build fails like:

```
vendor/archive/tar/common.go:541:32: undefined: any
vendor/archive/tar/strconv.go:204:15: undefined: strings.Cut
vendor/archive/tar/strconv.go:254:20: undefined: strings.Cut
vendor/archive/tar/strconv.go:276:13: undefined: strings.Cut
```

See also https://github.com/moby/moby/commit/3d4616f943b3.
This commit is contained in:
Dongsu Park 2022-09-14 12:16:24 +02:00
parent 6fa59b8b52
commit b34c3e06a2
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.18.ebuild vendored
View File

@ -6,7 +6,7 @@ GIT_COMMIT=e32519c693
EGO_PN="github.com/docker/cli" EGO_PN="github.com/docker/cli"
COREOS_GO_PACKAGE="${EGO_PN}" COREOS_GO_PACKAGE="${EGO_PN}"
COREOS_GO_VERSION="go1.17" COREOS_GO_VERSION="go1.18"
inherit bash-completion-r1 golang-vcs-snapshot coreos-go-depend inherit bash-completion-r1 golang-vcs-snapshot coreos-go-depend

4
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.18.ebuild vendored
View File

@ -4,12 +4,10 @@
EAPI=7 EAPI=7
EGO_PN=github.com/docker/docker EGO_PN=github.com/docker/docker
GIT_COMMIT=7f84219a3c GIT_COMMIT=7f84219a3c
# Flatcar: force building with go1.17 like upstream does COREOS_GO_VERSION="go1.18"
COREOS_GO_VERSION="go1.17"
COREOS_GO_GO111MODULE="off" COREOS_GO_GO111MODULE="off"
inherit bash-completion-r1 linux-info systemd udev golang-vcs-snapshot inherit bash-completion-r1 linux-info systemd udev golang-vcs-snapshot
# Flatcar: use coreos-go-depend to force building with go1.17
inherit coreos-go-depend inherit coreos-go-depend
DESCRIPTION="The core functions you need to create Docker images and run Docker containers" DESCRIPTION="The core functions you need to create Docker images and run Docker containers"