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

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

Merged
merged 2 commits into from
Jul 12, 2017
Merged

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

merged 2 commits into from
Jul 12, 2017

Conversation

andrewhsu
Copy link
Contributor

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 2 commits July 11, 2017 05:42
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>
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>
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

ping @albers @mlaventure

@andrewhsu andrewhsu modified the milestone: 17.06.1 Jul 12, 2017
Copy link
Contributor

@mlaventure mlaventure left a comment

Choose a reason for hiding this comment

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

LGTM

@mlaventure mlaventure merged commit 1e1c6b2 into docker-archive:17.06 Jul 12, 2017
@albers
Copy link
Contributor

albers commented Jul 12, 2017

LGTM

@andrewhsu andrewhsu deleted the dont-prune-vol branch July 12, 2017 21:30
docker-jenkins pushed a commit that referenced this pull request May 23, 2018
Set GO_VERSION with a build arg
Upstream-commit: 05cbbc2
Component: packaging
docker-jenkins pushed a commit that referenced this pull request Nov 15, 2018
…tests

[18.09 backport] Cleanup volume integration tests
Upstream-commit: 4980e48e4b2c34288cf3f1265db6eff6713b487c
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 29, 2020
[17.06] backport (cli) Don't prune volumes on docker system prune
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
5 participants