New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[17.06] backport (cli) Don't prune volumes on docker system prune #109

Merged
merged 2 commits into from Jul 12, 2017

Conversation

Projects
None yet
5 participants
@andrewhsu
Collaborator

andrewhsu commented Jul 11, 2017

Backport from upstream PRs:

With cherry-pick docker/cli@37fd612 and docker/cli@849b0e9:

$ git cherry-pick -s -x -Xsubtree=components/cli 37fd612 849b0e9

Conflict with components/cli/cli/command/system/prune.go but was able to resolve by taking the cherry-pick's change set.

cpuguy83 and others added some commits May 22, 2017

Don't prune volumes on `docker system prune`
Volumes tend to carry important data and pruning them on `docker system
prune` can easily cause unwanted data loss.

Let's play it safe and not prune volumes on `system prune` by default,
and instead provide an option.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 37fd6128dc268b885f070b6d89a72e73d2eacec8)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
system prune: only warn about volumes if --volumes is given
Signed-off-by: Harald Albers <github@albersweb.de>(cherry picked from commit 849b0e96a01e657f4be4c35e7fa4bce2736dc376)

Conflicts:
components/cli/cli/command/system/prune.go
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>

@andrewhsu andrewhsu modified the milestone: 17.06.1 Jul 12, 2017

@mlaventure

LGTM

@mlaventure mlaventure merged commit 1e1c6b2 into docker:17.06 Jul 12, 2017

3 checks passed

ce-tests Jenkins build docker-ce-17.06-pr 157 has succeeded
Details
ce-tests-WoW-RS1 Jenkins build docker-ce-17.06-pr-WoW-RS1 146 has succeeded
Details
dco-signed All commits are signed
@albers

This comment has been minimized.

Show comment
Hide comment
@albers

albers Jul 12, 2017

Member

LGTM

Member

albers commented Jul 12, 2017

LGTM

@andrewhsu andrewhsu deleted the andrewhsu:dont-prune-vol branch Jul 12, 2017

docker-jenkins pushed a commit that referenced this pull request May 23, 2018

Merge pull request #109 from corbin-coleman/golang-as-arg
Set GO_VERSION with a build arg
Upstream-commit: 05cbbc250f5d677ed43546042a38b2eacf45dbe1
Component: packaging
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment