Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

[19.03 backport] Bump Golang 1.12.5 #209

Merged
merged 19 commits into from
May 14, 2019
Merged

[19.03 backport] Bump Golang 1.12.5 #209

merged 19 commits into from
May 14, 2019

Commits on May 13, 2019

  1. Dockerfile.e2e fix TestBuildPreserveOwnership 

    The Dockerfile missed some fixtures, which caused this test
fail when running from this image.

I also noticed some other fixtures missing in integration-cli,
where the image had symlinks to some certificates, but the
original files were not included;

```
|-- integration-cli
    |-- fixtures
    |   |-- auth
    |   |   `-- docker-credential-shell-test
    |   |-- credentialspecs
    |   |   `-- valid.json
    |   |-- https
    |   |   |-- ca.pem -> ../../../integration/testdata/https/ca.pem
    |   |   |-- client-cert.pem -> ../../../integration/testdata/https/client-cert.pem
    |   |   |-- client-key.pem -> ../../../integration/testdata/https/client-key.pem
    |   |   |-- client-rogue-cert.pem
    |   |   |-- client-rogue-key.pem
    |   |   |-- server-cert.pem -> ../../../integration/testdata/https/server-cert.pem
    |   |   |-- server-key.pem -> ../../../integration/testdata/https/server-key.pem
    |   |   |-- server-rogue-cert.pem
    |   |   `-- server-rogue-key.pem
```

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 48fd0e9)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed May 13, 2019
    Configuration menu
    Copy the full SHA
    3afbf83 View commit details
    Browse the repository at this point in the history

  2. Dockerfile.e2e: use alpine 3.9 

    Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 2026268)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed May 13, 2019
    Configuration menu
    Copy the full SHA
    1fdd245 View commit details
    Browse the repository at this point in the history

  3. Dockerfile.e2e: move frozen-images to a separate stage 

    Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 5554bd1)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed May 13, 2019
    Configuration menu
    Copy the full SHA
    dc6d1ac View commit details
    Browse the repository at this point in the history

  4. Dockerfile.e2e: re-order steps for caching 

    Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 63aefbf)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed May 13, 2019
    Configuration menu
    Copy the full SHA
    ce9cabf View commit details
    Browse the repository at this point in the history

  5. Dockerfile.e2e: use /build to be consistent with main Dockerfile 

    Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 045beed)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed May 13, 2019
    Configuration menu
    Copy the full SHA
    6605a26 View commit details
    Browse the repository at this point in the history

  6. Dockerfile.e2e: move dockercli to a separate build-stage 

    Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit e7784a6)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed May 13, 2019
    Configuration menu
    Copy the full SHA
    d36c7de View commit details
    Browse the repository at this point in the history

  7. Dockerfile.e2e: move "contrib" to a separate build-stage 

    Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 3ededb8)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed May 13, 2019
    Configuration menu
    Copy the full SHA
    7d3405b View commit details
    Browse the repository at this point in the history

  8. Dockerfile.e2e: builder: change output directory to simplify copy 

    Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit b73e340)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed May 13, 2019
    Configuration menu
    Copy the full SHA
    cb8d675 View commit details
    Browse the repository at this point in the history

  9. Skip TestNISDomainname on API < 1.40 

    Older versions of the daemon would concatenate hostname and
domainname, so hostname "foobar" and domainname "baz.cyphar.com"
would produce `foobar.baz.cyphar.com` as hostname.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit c91c377)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed May 13, 2019
    Configuration menu
    Copy the full SHA
    11e2802 View commit details
    Browse the repository at this point in the history

  10. Remove TestContainerAPICreateWithHostName 

    TestNISDomainname in the integration suite covers this

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 2b5880c)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed May 13, 2019
    Configuration menu
    Copy the full SHA
    e1b045c View commit details
    Browse the repository at this point in the history

  11. Fix TestVolumesCreateAndList when running against a shared daemon 

    The daemon may already have other volumes, so filter out those
when running the test.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 566eea1)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed May 13, 2019
    Configuration menu
    Copy the full SHA
    620d9d3 View commit details
    Browse the repository at this point in the history

  12. Skip TestBuildWithEmptyDockerfile on API < v1.40 

    Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 0e7b46a)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed May 13, 2019
    Configuration menu
    Copy the full SHA
    545bc6b View commit details
    Browse the repository at this point in the history

  13. Skip TestPingCacheHeaders on API < v1.40 

    Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit d080a86)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed May 13, 2019
    Configuration menu
    Copy the full SHA
    cedf201 View commit details
    Browse the repository at this point in the history

  14. Skip TestUUIDGeneration on API < v1.40 

    Older versions did not use an UUID as ID

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 05bd995)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed May 13, 2019
    Configuration menu
    Copy the full SHA
    a3b4e92 View commit details
    Browse the repository at this point in the history

  15. Skip TestImagesFilterMultiReference on API < v1.40 

    Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 83ac2b4)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed May 13, 2019
    Configuration menu
    Copy the full SHA
    5f60a56 View commit details
    Browse the repository at this point in the history

  16. TestIpcModeOlderClient: skip if client < 1.40 

    This test case requires not just daemon >= 1.40, but also
client API >= 1.40. In case older client is used, we'll
get failure from the very first check:

> ipcmode_linux_test.go:313: assertion failed: shareable (string) != private (string)

Signed-off-by: Kir Kolyshkin <[email protected]>
(cherry picked from commit 1ada1c8)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @kolyshkin @thaJeztah
    kolyshkin authored and thaJeztah committed May 13, 2019
    Configuration menu
    Copy the full SHA
    8d42845 View commit details
    Browse the repository at this point in the history

  17. Dockerfile.e2e: copy test sources 

    Package "gotest.tools/assert" uses source introspection to
print more info in case of assertion failure. When source code
is not available, it prints an error instead.

In other words, before this commit:

> --- SKIP: TestCgroupDriverSystemdMemoryLimit (0.00s)
>     cgroupdriver_systemd_test.go:32: failed to parse source file: /go/src/github.com/docker/docker/integration/system/cgroupdriver_systemd_test.go: open /go/src/github.com/docker/docker/integration/system/cgroupdriver_systemd_test.go: no such file or directory
>     cgroupdriver_systemd_test.go:32:

and after:

> --- SKIP: TestCgroupDriverSystemdMemoryLimit (0.09s)
>    cgroupdriver_systemd_test.go:32: !hasSystemd()

This increases the resulting image size by about 2 MB
on my system (from 758 to 760 MB).

Signed-off-by: Kir Kolyshkin <[email protected]>
(cherry picked from commit 0deb18a)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @kolyshkin @thaJeztah
    kolyshkin authored and thaJeztah committed May 13, 2019
    Configuration menu
    Copy the full SHA
    2e95499 View commit details
    Browse the repository at this point in the history

  18. Dockerfile.e2e: fix DOCKER_GITCOMMIT handling 

    1. There is no need to persist DOCKER_GITCOMMIT,
as it's not needed for runtime, only for build.
So, remove ENV.

2. In case $GITCOMMIT is not defined during build time
(and it happens if .git directory is not present),
we still need to have some value set, so set it to
`undefined`. Otherwise we'll have something like

>  => ERROR [builder 2/3] RUN hack/make.sh build-integration-test-binary
> ------
>  > [builder 2/3] RUN hack/make.sh build-integration-test-binary:
> moby#32 0.488
> moby#32 0.505 error: .git directory missing and DOCKER_GITCOMMIT not specified
> moby#32 0.505   Please either build with the .git directory accessible, or specify the
> moby#32 0.505   exact (--short) commit hash you are building using DOCKER_GITCOMMIT for
> moby#32 0.505   future accountability in diagnosing build issues.  Thanks!

Signed-off-by: Kir Kolyshkin <[email protected]>
(cherry picked from commit c3b2494)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @kolyshkin @thaJeztah
    kolyshkin authored and thaJeztah committed May 13, 2019
    Configuration menu
    Copy the full SHA
    14bb71d View commit details
    Browse the repository at this point in the history

  19. Bump Golang 1.12.5 

    Signed-off-by: Jintao Zhang <[email protected]>
(cherry picked from commit 3a4c5b6)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @tao12345666333 @thaJeztah
    tao12345666333 authored and thaJeztah committed May 13, 2019
    Configuration menu
    Copy the full SHA
    6d0823a View commit details
    Browse the repository at this point in the history