[18.09] Bump Golang to 1.11.12 by kolyshkin · Pull Request #302 · docker-archive/engine

kolyshkin · 2019-07-23T22:44:44Z

Bump Go to 1.11.12

go1.11.12 (released 2019/07/08) includes fixes to the compiler and the linker.
See the Go 1.11.12 milestone on our issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.11.12

Full diff: golang/go@go1.11.11...go1.11.12

Misc Dockerfile improvements

Dockerfile.e2e: simplify apk calls moby/moby#37953 Dockerfile.e2e: simplify apk calls
Dockerfile: Use APT_MIRROR for security.debian.org as well moby/moby#39537 Dockerfile: Use APT_MIRROR for security.debian.org as well
Dockerfile: use GO_VERSION build-arg for overriding Go version moby/moby#39548 Dockerfile: use GO_VERSION build-arg for overriding Go version
Dockerfile.windows: trim .0 from Go versions moby/moby#39585 Dockerfile.windows: trim .0 from Go versions
Windows: fix Golang version checks for GO_VERSION build-arg moby/moby#39586 Windows: fix Golang version checks for GO_VERSION build-arg
Pin Dockerfile to -stretch variant because it's bust'd moby/moby#39582 Pin Dockerfile to -stretch variant because it's bust'd

go1.11.12 (released 2019/07/08) includes fixes to the compiler and the linker. See the Go 1.11.12 milestone on our issue tracker for details: https://github.com/golang/go/issues?q=milestone%3AGo1.11.12 Full diff: golang/go@go1.11.11...go1.11.12 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

thaJeztah · 2019-07-23T23:34:00Z

Need to cherry-pick some other changes

Dockerfile: use GO_VERSION build-arg for overriding Go version moby/moby#39548 Dockerfile: use GO_VERSION build-arg for overriding Go version
Dockerfile.windows: trim .0 from Go versions moby/moby#39585 Dockerfile.windows: trim .0 from Go versions
Windows: fix Golang version checks for GO_VERSION build-arg moby/moby#39586 Windows: fix Golang version checks for GO_VERSION build-arg
Pin Dockerfile to -stretch variant because it's bust'd moby/moby#39582 Pin Dockerfile to -stretch variant because it's bust'd

 22:45:29 E: Unable to locate package libprotobuf-c0-dev

thaJeztah · 2019-07-25T00:34:35Z

ping @kolyshkin ^^

As of Alpine Linux 3.3 (or 3.2?) there exists a new --no-cache option for apk. It allows users to install packages with an index that is updated and used on-the-fly and not cached locally. This avoids the need to use --update and remove /var/cache/apk/* when done installing packages. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit 3b44dd6) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

The fastly cdn mirror we're using also mirrors the debian security repository; ``` Welcome to deb.debian.org (fastly instance)! This is deb.debian.org. This service provides mirrors for the following Debian archive repositories: /debian/ /debian-debug/ /debian-ports/ /debian-security/ The server deb.debian.org does not have packages itself, but the name has SRV records in DNS that let apt in stretch and later find places. ``` Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit c8f43b5) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> Conflicts: * Dockerfile (GO_VERSION value differs, and CROSS (moby#39010) is absent) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

kolyshkin · 2019-07-26T19:58:23Z

Also

Dockerfile.e2e: simplify apk calls moby/moby#37953 Dockerfile.e2e: simplify apk calls
Dockerfile: Use APT_MIRROR for security.debian.org as well moby/moby#39537 Dockerfile: Use APT_MIRROR for security.debian.org as well

kolyshkin · 2019-07-26T20:00:59Z

@thaJeztah PTAL

thaJeztah

LGTM, thanks!

thaJeztah · 2019-07-26T20:44:39Z

Is this the failure?

20:13:55 /go/src/github.com/docker/docker/hack/ci/janky: line 7: GIT_SHA1: unbound variable
20:13:57 Build step 'Execute shell' marked build as failure

@seemethere @andrewhsu ?

andrewhsu · 2019-07-26T22:27:19Z

I think we need this cherry-picked to the 18.09 codeline: moby@bd5c537

andrewhsu · 2019-07-26T22:53:57Z

I've added the environment variable GIT_SHA1 back to the jenkins job for now.

kolyshkin · 2019-08-06T19:18:44Z

Looks like this one is ready to merge, except I don't know how to restart janky CI

kolyshkin · 2019-08-07T05:55:45Z

Janky failure is

02:39:07.872 Step 24/29 : COPY --from=builder /output/docker-frozen-images /docker-frozen-images
02:39:08.916 invalid from flag value builder: pull access denied for builder, repository does not exist or may require 'docker login'
02:39:08.925 Build step 'Execute shell' marked build as failure

Did we really broke something?

This allows overriding the version of Go without making modifications in the source code, which can be useful to test against multiple versions. For example: make GO_VERSION=1.13beta1 shell Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit c6281bc) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> Conflicts: * Dockerfile, Dockerfile.e2e, Dockerfile.simple, Dockerfile.windows: (due to Go version difference, missing CROSS etc.)

This was an oversight when changing the Dockerfile to use a build-arg; the Windows Dockerfile downloads the Go binaries, which never have a trailing `.0`. This patch makes sure that the trailing zero (if any) is removed. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit c5bd6e3) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

This check was used to make sure we don't bump Go versions independently (Linux/Windows). The Dockerfile switched to using a build-arg to allow overriding the Go version, which rendered this check non-functional. It also fails if Linux versions use a specific variant of the image; 08:41:31 ERROR: Failed 'ERROR: Mismatched GO versions between Dockerfile and Dockerfile.windows. Update your PR to ensure that both files are updated and in sync. ${GO_VERSION}-stretch ${GO_VERSION}' at 07/20/2019 08:41:31 08:41:31 At C:\gopath\src\github.com\docker\docker\hack\ci\windows.ps1:448 char:9 08:41:31 + Throw "ERROR: Mismatched GO versions between Dockerfile and D ... 08:41:31 + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This patch fixes the check by looking for the value of `GO_VERSION` instead of looking at the `FROM` line (which is harder to parse). Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 4fa57a8) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

The Golang base images switch to buster, which causes some breakage in networking and packages that are no longer available; (`btrfs-tools` is now an empty package, and `libprotobuf-c0-dev` is gone). Some of out tests also start faiilng on stretch, and will have to be investigated further; ``` 15:13:06 --- FAIL: TestRenameAnonymousContainer (3.37s) 15:13:06 rename_test.go:168: assertion failed: 0 (int) != 1 (inspect.State.ExitCode int): container a7fe866d588d65f353f42ffc5ea5288e52700384e1d90850e9c3d4dce8657666 exited with the wrong exitcode: 15:13:38 --- FAIL: TestHostnameDnsResolution (2.23s) 15:13:38 run_linux_test.go:128: assertion failed: 15:13:38 --- ← 15:13:38 +++ → 15:13:38 @@ -1 +1,2 @@ 15:13:38 +ping: bad address 'foobar' 15:13:38 15:13:38 15:13:38 run_linux_test.go:129: assertion failed: 0 (int) != 1 (res.ExitCode int) ``` Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit ed672bb) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

kolyshkin · 2019-08-07T06:04:31Z

Yes we did, looks like commit 697cd3d85dbfb73c68a7b0c7646b6b85a665799e changes base to builder. My bad. Fixed, force-pushed.

thaJeztah · 2019-08-07T18:48:34Z

Only failures are https://jenkins.dockerproject.org/job/Docker-PRs-experimental/46361/console experimental:

06:39:37 FAIL: docker_cli_run_test.go:1792: DockerSuite.TestRunInteractiveWithRestartPolicy
06:39:37 
06:39:37 assertion failed: 
06:39:37 Command:  /usr/local/cli/docker run -i --name test-inter-restart --restart=always busybox sh
06:39:37 ExitCode: 0
06:39:37 Error:    <nil>
06:39:37 Stdout:   
06:39:37 Stderr:   
06:39:37 
06:39:37 Failures:
06:39:37 ExitCode was 0 expected 11

Janky https://jenkins.dockerproject.org/job/Docker-PRs/55270/console

07:46:52 FAIL: docker_cli_start_test.go:190: DockerSuite.TestStartReturnCorrectExitCode
07:46:52 
07:46:52 assertion failed: expected an error, got nil

thaJeztah

LGTM

andrewhsu

LGTM

thaJeztah mentioned this pull request Jul 23, 2019

[18.09] bump golang 1.11.12 docker/docker-ce-packaging#364

Merged

4 tasks

kolyshkin requested a review from thaJeztah July 23, 2019 22:52

thaJeztah added this to the 18.09.9 milestone Jul 23, 2019

kolyshkin and others added 2 commits July 25, 2019 09:22

thaJeztah approved these changes Jul 26, 2019

View reviewed changes

kolyshkin force-pushed the 18.09-go-1.11.12 branch from b585383 to b12b108 Compare August 6, 2019 21:19

thaJeztah added 4 commits August 6, 2019 23:03

kolyshkin force-pushed the 18.09-go-1.11.12 branch from b12b108 to 3c1bc29 Compare August 7, 2019 06:04

thaJeztah approved these changes Aug 7, 2019

View reviewed changes

andrewhsu approved these changes Aug 7, 2019

View reviewed changes

andrewhsu merged commit 3618280 into docker-archive:18.09 Aug 7, 2019

thaJeztah changed the title ~~[18.09] Bump Go to 1.11.12~~ [18.09] Bump Golang to 1.11.12 Aug 12, 2019

thaJeztah mentioned this pull request Aug 28, 2019

[18.09 backport] Jenkinsfile, CI, and Makefile updates #338

Merged

Conversation

kolyshkin commented Jul 23, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Bump Go to 1.11.12

Misc Dockerfile improvements

Uh oh!

thaJeztah commented Jul 23, 2019

Uh oh!

thaJeztah commented Jul 25, 2019

Uh oh!

kolyshkin commented Jul 26, 2019

Uh oh!

kolyshkin commented Jul 26, 2019

Uh oh!

thaJeztah left a comment

Choose a reason for hiding this comment

Uh oh!

thaJeztah commented Jul 26, 2019

Uh oh!

andrewhsu commented Jul 26, 2019

Uh oh!

andrewhsu commented Jul 26, 2019

Uh oh!

kolyshkin commented Aug 6, 2019

Uh oh!

kolyshkin commented Aug 7, 2019

Uh oh!

kolyshkin commented Aug 7, 2019

Uh oh!

thaJeztah commented Aug 7, 2019

Uh oh!

thaJeztah left a comment

Choose a reason for hiding this comment

Uh oh!

andrewhsu left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

kolyshkin commented Jul 23, 2019 •

edited

Loading