Skip to content

bump to Go 1.13#233

Merged
tiborvass merged 2 commits intodocker:masterfrom
silvin-lubecki:go-1.13
Mar 4, 2020
Merged

bump to Go 1.13#233
tiborvass merged 2 commits intodocker:masterfrom
silvin-lubecki:go-1.13

Conversation

@silvin-lubecki
Copy link
Copy Markdown
Contributor

Golang 1.13 comes with new restrictions on pseudo-version, so had to fix some of these.
Also bumped buildkit to last v0.6.4.

Comment thread go.mod
github.com/docker/compose-on-kubernetes v0.4.19-0.20190128150448-356b2919c496 // indirect
github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible
github.com/docker/docker v1.14.0-0.20191210192822-1347481b9eb5
github.com/docker/docker v1.14.0-0.20190319215453-e7b5f7dbe98c
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why don't use v0.0.0? insteadt v1.14.0 which isn't a docker/docker version at all

Comment thread go.mod

replace github.com/containerd/containerd => github.com/containerd/containerd v1.3.3

replace github.com/docker/docker => github.com/docker/docker v1.4.2-0.20200227233006-38f52c9fec82
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

maybe not need if we use v0.0.0 version in the declaration above?

Copy link
Copy Markdown
Member

@tonistiigi tonistiigi left a comment

Choose a reason for hiding this comment

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

Re: version prefixes. We just need to decide what prefixes to use when vendoring from master branch of moby/cli/containerd that use release branches that gomod can't sort properly and document it. These cases will need rewrite rules for safety so require prefix doesn't matter for building the project. It may matter when the project is imported and for readability (eg. I would argue that v1.14.0-0 does carry some information about it being the master branch. @tiborvass

Comment thread go.mod Outdated
vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 // indirect
)

replace github.com/containerd/containerd => github.com/containerd/containerd v1.3.3
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We should use the same versions that are defined in buildkit

@silvin-lubecki silvin-lubecki force-pushed the go-1.13 branch 3 times, most recently from 9c6b10e to 841b982 Compare March 4, 2020 10:26
@silvin-lubecki
Copy link
Copy Markdown
Contributor Author

@tonistiigi PTAL, I put the prefixes back and used the same containerd version as buildkit 👍

@thaJeztah
Copy link
Copy Markdown
Member

Looks like Jenkins CI here is running on ci.docker.com (which was moved to ci-next.docker.com) @StefanScherer

@thaJeztah
Copy link
Copy Markdown
Member

Looks like it's only the fossa scan in Jenkins (?), so opened #234 to remove it

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

SGTM, but I'd like @tonistiigi to give this another look

@tonistiigi
Copy link
Copy Markdown
Member

Afaics this takes Buildkit 0.6.4 but buildkit dependencies from master, so it is an untested configuration. (I'm surprised it even builds but I guess buildx doesn't actually use many packages from it). As v0.6.x was never built on 1.13 I'd suggest taking master buildkit as well.

Bump github.com/gogo/googleapis to v1.3.2
Bump github.com/docker/cli to master

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Comment thread go.mod
github.com/containerd/containerd v1.4.0-0
github.com/denisenkom/go-mssqldb v0.0.0-20190315220205-a8ed825ac853 // indirect
github.com/docker/cli v1.14.0-0.20191010210043-06f34ba50786
github.com/docker/cli v1.14.0-0
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

i've never seen this short format. Maybe we should do the same for the docker/docker line ?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Ok I guess I have seen it, just not with -0

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.

5 participants