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

Ensure service images get default tag and print familiar strings #13

Merged
merged 2 commits into from
Jun 10, 2017

Conversation

mlaventure
Copy link
Contributor


Cherry pick of moby/moby#33279 which fixed docker/cli#79 (AKA docker service ls/ps is not truncating digests anymore)

Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
(cherry picked from commit 5efcec7)
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
(cherry picked from commit 75c7536)
@mavenugo mavenugo mentioned this pull request May 31, 2017
23 tasks
Copy link
Contributor

@nishanttotla nishanttotla left a comment

Choose a reason for hiding this comment

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

@mlaventure given these changes are in the client package, do we need to import them into docker/cli as well to make sure they get into the release?

I'm not sure how the process works at the moment because we have multiple repos, but docker/cli uses its own vendored version of the moby/moby client package.

Let me know if I can help in any way.

cc @andrewhsu

@mlaventure
Copy link
Contributor Author

I'd say it's fine that way, docker/cli is still technically an independent package.

@nishanttotla
Copy link
Contributor

nishanttotla commented May 31, 2017

@mlaventure I'm talking about this https://github.com/docker/docker-ce/blob/master/components/cli/vendor/github.com/docker/docker/client/service_create.go

Shouldn't this file also be updated, along with the corresponding vendored versions of files changed in this PR?

@mlaventure
Copy link
Contributor Author

@nishanttotla if It needs to be updated their should be an equivalent cherry-pick for it from docker/cli. Do you have the PR number that does so?

@nishanttotla
Copy link
Contributor

@mlaventure that's what I was asking about. The process seems unclear right now. I'll open a vendor PR.

@andrewhsu
Copy link
Contributor

LGTM

this one will go in first before the related ticket #32

@andrewhsu andrewhsu merged commit 4e13702 into docker-archive:17.06 Jun 10, 2017
@mlaventure mlaventure deleted the chp-moby-33279 branch June 12, 2017 14:55
andrewhsu added a commit that referenced this pull request Jun 15, 2017
Add systemd scripts
Upstream-commit: 9c1135d
Component: packaging
@andrewhsu andrewhsu modified the milestone: 17.06.0 Jul 12, 2017
docker-jenkins pushed a commit that referenced this pull request Jul 9, 2018
[18.06] Bump swarmkit to include task reaper fixes and more metrics.
Upstream-commit: 73ca638f393dab7277f1a1797b24ab1777138a13
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 30, 2020
Add systemd scripts
Upstream-commit: 9c1135d
Component: packaging
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 30, 2020
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
Ensure service images get default tag and print familiar strings
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.

3 participants