Skip to content

[19.03 backport] bump Golang 1.13.10#454

Merged
silvin-lubecki merged 4 commits intodocker:19.03from
thaJeztah:19.03_backport_bump_golang_1.13.10
Apr 21, 2020
Merged

[19.03 backport] bump Golang 1.13.10#454
silvin-lubecki merged 4 commits intodocker:19.03from
thaJeztah:19.03_backport_bump_golang_1.13.10

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Apr 14, 2020

backport of:

@thaJeztah
Copy link
Copy Markdown
Member Author

Arf; CI is failing on Buildx;

make[2]: Entering directory '/go/src/github.com/docker/app'
go build -tags="" -ldflags="-s -w -X github.com/docker/app/internal.GitCommit=7eea32b -X github.com/docker/app/internal.Version=v0.8.0 -X github.com/docker/app/internal.Experimental=off -X github.com/docker/app/internal.BuildTime=2020-04-14T12:25:48Z" -o bin/docker-app ./cmd/docker-app
make[2]: Leaving directory '/go/src/github.com/docker/app'
Cloning into '/go/src/github.com/docker/buildx'...
Fetching origin
+ go build -o bin/docker-buildx -ldflags '-X github.com/docker/buildx/version.Version=v0.3.1-tp-docker -X github.com/docker/buildx/version.Revision=6db68d029599c6710a32aa7adcba8e5a344795a7 -X github.com/docker/buildx/version.Package=github.com/docker/buildx -X main.experimental=1' ./cmd/buildx
go: github.com/containerd/containerd@v1.3.0-0.20190507210959-7c1e88399ec0: invalid pseudo-version: version before v1.3.0 would have negative patch number
debian/rules:12: recipe for target 'override_dh_auto_build' failed
make[1]: Leaving directory '/root/build-deb'
make[1]: *** [override_dh_auto_build] Error 1
debian/rules:67: recipe for target 'build' failed
make: *** [build] Error 2
dpkg-buildpackage: error: debian/rules build gave error exit status 2
Makefile:71: recipe for target 'ubuntu-xenial' failed

@thaJeztah
Copy link
Copy Markdown
Member Author

Buildx is fixed on master through docker/buildx#233, but that's not in the tag that we're using in the 19.03 branch

@thaJeztah
Copy link
Copy Markdown
Member Author

Diff between v0.3.1 and master: docker/buildx@v0.3.1...master
and diff between v0.3.1 and the commit that fixed Go 1.13 compatibility: docker/buildx@v0.3.1...52b0ea3

Wondering if 52b0ea328fee203354fb6fadf3bf5ac8fc22060f should be tagged as v0.3.2 (e.g.); assuming we don't want the update to builkit v0.7 in the version that we ship with 19.03

@thaJeztah
Copy link
Copy Markdown
Member Author

@tiborvass @tonistiigi ^^ any ideas what's best?

@tonistiigi
Copy link
Copy Markdown
Member

We can tag. Or that commit should be built with go1.12. The only tested configuration is the build process in the Dockerfile.

@thaJeztah
Copy link
Copy Markdown
Member Author

Building with a different Go version would be a bit tricky as all binaries are built in the same environment (and hence would be built with the same go version). Given that buildx is shipped as an experimental feature/plugin, I think updating to a newer version would be ok (assuming current master plays "nice" with 19.03)

thaJeztah and others added 4 commits April 21, 2020 11:00
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit cca0c0e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit c7ed674)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
(cherry picked from commit e347bb9)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
go1.13.10 (released 2020/04/08) includes fixes to the go command, the runtime,
os/exec, and time packages. See the Go 1.13.10 milestone on the issue tracker
for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.13.10+label%3ACherryPickApproved

full diff: golang/go@go1.13.9...go1.13.10

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 382364f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the 19.03_backport_bump_golang_1.13.10 branch from 3c20b2a to 16cae32 Compare April 21, 2020 09:01
@thaJeztah
Copy link
Copy Markdown
Member Author

I included #455 to force Go modules to use vendor mode; and it's green now 🎉 (thanks @chris-crone for the suggestion!)

Copy link
Copy Markdown
Contributor

@silvin-lubecki silvin-lubecki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@silvin-lubecki silvin-lubecki merged commit 7a9d665 into docker:19.03 Apr 21, 2020
@thaJeztah thaJeztah deleted the 19.03_backport_bump_golang_1.13.10 branch April 21, 2020 11:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants