8000 [19.03 backport] use GO_VERSION and pin to debian stretch by thaJeztah · Pull Request #313 · docker-archive/engine · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[19.03 backport] use GO_VERSION and pin to debian stretch #313

Merged
merged 5 commits into from
Aug 8, 2019
Merged

[19.03 backport] use GO_VERSION and pin to debian stretch #313

merged 5 commits into from
Aug 8, 2019

Conversation

thaJeztah
Copy link
Member

Backports of:

thaJeztah and others added 5 commits August 8, 2019 03:20
@thaJeztah
Dockerfile: Use APT_MIRROR for security.debian.org as well
3bf3a1a 
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: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Dockerfile: use GO_VERSION build-arg for overriding Go version
c364e5d 
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: Sebastiaan van Stijn <github@gone.nl>
@kolyshkin @thaJeztah
TESTING.md: document GO_VERSION
97ca643 
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit a557538)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Windows: fix Golang version checks for GO_VERSION build-arg
640193b 
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: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Pin Dockerfile to -stretch variant
2f1984c 
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: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 19.03.2 milestone Aug 8, 2019
@thaJeztah thaJeztah mentioned this pull request Aug 8, 2019
Merged
andrewhsu
andrewhsu approved these changes Aug 8, 2019
View reviewed changes
Copy link
@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

LGTM on green

@thaJeztah thaJeztah mentioned this pull request Aug 8, 2019
Merged
@thaJeztah
Copy link
Member Author

Only failure on experimental is https://jenkins.dockerproject.org/job/Docker-PRs-experimental/46399/console

02:02:21 FAIL: docker_cli_daemon_test.go:1436: DockerDaemonSuite.TestCleanupMountsAfterDaemonAndContainerKill

Which is/was a known flaky test

02:02:21 FAIL: docker_cli_daemon_test.go:1436: DockerDaemonSuite.TestCleanupMountsAfterDaemonAndContainerKill
02:02:21 
02:02:21 Creating a new daemon
02:02:21 Creating a new daemon
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] daemon started
02:02:21 
02:02:21 [de206ccf7710e] exiting daemon
02:02:21 Daemon de206ccf7710e is not started
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for d
B6A1
aemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 [de206ccf7710e] error pinging daemon on start: Get http://%2Ftmp%2Fdocker-integration%2Fde206ccf7710e.sock/_ping: context deadline exceeded
02:02:21 [de206ccf7710e] waiting for daemon to start
02:02:21 docker_cli_daemon_test.go:1463:
02:02:21     // restart daemon.
02:02:21     d.Restart(c)
02:02:21 /go/src/github.com/docker/docker/internal/test/daemon/daemon.go:199:
02:02:21     t.Fatalf("failed to start daemon with arguments %v : %v", args, err)
02:02:21 ... Error: failed to start daemon with arguments [] : [de206ccf7710e] Daemon exited and never started
02:02:21

@thaJeztah
Copy link
Member Author

I'll merge this one

@thaJeztah thaJeztah merged commit 6e9aba8 into docker-archive:19.03 Aug 8, 2019
@thaJeztah thaJeztah deleted the 19.03_backport_its_a_stretch_but_it_was_busted branch August 8, 2019 15:04
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
1 more reviewer

@andrewhsu andrewhsu andrewhsu approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
19.03.2
Development

Successfully merging this pull request may close these issues.
3 participants
@thaJeztah @andrewhsu @kolyshkin
0