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

[18.03] move trust out of experimental #461

Merged
merged 5 commits into from
Mar 14, 2018
Merged

[18.03] move trust out of experimental #461

merged 5 commits into from
Mar 14, 2018

Conversation

vdemeester
Copy link
Contributor

Cherry-picks — were not clean, conflicts on unit tests.

git cherry-pick -Ss -x -Xsubtree=components/cli c5554f811b385f84e57d57bf89d97d4ec1efe1e3 # conflicts
git cherry-pick -Ss -x -Xsubtree=components/cli 8c3d0b93d631f948376a81c7baecc6dad88ce248 # conflicts
git cherry-pick -Ss -x -Xsubtree=components/cli ac35e851e858b61b0b93167d94708b6e90e4b954
git cherry-pick -Ss -x -Xsubtree=components/cli 09ec6d4ad9f7040918f410e7382095dd70570261
git cherry-pick -Ss -x -Xsubtree=components/cli 2a6808db87229fb4269251f6bd69e9079cc827b4

Backport fix(es) from:

cc @andrewhsu @n4ss @vieux @thaJeztah

n4ss and others added 5 commits March 14, 2018 08:59
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com>
(cherry picked from commit c5554f811b385f84e57d57bf89d97d4ec1efe1e3)
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com>
(cherry picked from commit 8c3d0b93d631f948376a81c7baecc6dad88ce248)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com>
(cherry picked from commit ac35e851e858b61b0b93167d94708b6e90e4b954)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
(cherry picked from commit 09ec6d4ad9f7040918f410e7382095dd70570261)
The `docker trust` commands were moved out of experimental,
and the `docker trust view` command was changed to
`docker trust inspect --pretty`.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 2a6808db87229fb4269251f6bd69e9079cc827b4)
Copy link
Contributor

@vieux vieux left a comment

Choose a reason for hiding this comment

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

LGTM thanks @vdemeester ⚽️ @n4ss

Copy link
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.

LGTM, thanks!

@thaJeztah
Copy link
Member

PowerPC is failing on

09:11:54 PASS: docker_cli_events_unix_test.go:51: DockerSuite.TestEventsOOMDisableFalse	1.519s
09:16:57 --- FAIL: Test (1635.35s)
09:16:57 panic: DockerSuite.TestEventsOOMDisableTrue test timed out after 5m0s [recovered]
09:16:57 	panic: DockerSuite.TestEventsOOMDisableTrue test timed out after 5m0s

We should cherry-pick moby/moby#36539 here (let me open a PR)

@n4ss
Copy link
Contributor

n4ss commented Mar 14, 2018

LGTM ! ⚽️

@vdemeester
Copy link
Contributor Author

⚽ 🎉 😝

@andrewhsu
Copy link
Contributor

#460 has been merged to address the ppc64le oom failure

@andrewhsu andrewhsu merged commit 7d9137f into docker-archive:18.03 Mar 14, 2018
@vdemeester vdemeester deleted the trust-updates branch March 14, 2018 17:27
@andrewhsu andrewhsu added this to the 18.03.0 milestone Mar 14, 2018
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 24, 2020
docker-jenkins pushed a commit that referenced this pull request May 1, 2020
[master] Jenkinsfile: use docker/docker instead of docker/engine
Upstream-commit: 087705d
Component: packaging
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
[master] Jenkinsfile: use docker/docker instead of docker/engine
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants