Add argument to delete volumes on container remove #336

zoispag · 2019-06-13T18:56:24Z

Adds a boolean --remove-volumes argument to delete volumes on container remove.

Closes #190

Bear with me! This is my first attempt on Go code.
If you find issues, please point me to the correct direction on how to improve this PR.

Thanks

welcome · 2019-06-13T18:56:28Z

Thanks for opening this pull request! Please check out our contributing guidelines as well as our code of conduct.

zoispag · 2019-06-13T19:01:40Z

If this is the correct output of the tests, 0 have failed:

go test ./... -v
?   	github.com/containrrr/watchtower	[no test files]
=== RUN   TestActions
Running Suite: Actions Suite
============================
Random Seed: 1560452316
Will run 5 of 5 specs

••time="2019-06-13T20:58:39+02:00" level=info msg="Found multiple running watchtower instances. Cleaning up."
•time="2019-06-13T20:58:40+02:00" level=info msg="Found multiple running watchtower instances. Cleaning up."
•time="2019-06-13T20:58:41+02:00" level=info msg="Found multiple running watchtower instances. Cleaning up."
•
Ran 5 of 5 Specs in 5.018 seconds
SUCCESS! -- 5 Passed | 0 Failed | 0 Pending | 0 Skipped
--- PASS: TestActions (5.02s)
PASS
ok  	github.com/containrrr/watchtower/actions	(cached)
?   	github.com/containrrr/watchtower/app	[no test files]
=== RUN   TestContainer
Running Suite: Container Suite
==============================
Random Seed: 1560452316
Will run 20 of 20 specs

•time="2019-06-13T20:58:36+02:00" level=error msg=~/Projects/watchtower_fork/container/mocks/data/containers.json
time="2019-06-13T20:58:36+02:00" level=error msg=~/Projects/watchtower_fork/container/mocks/data/container_stopped.json
time="2019-06-13T20:58:36+02:00" level=error msg=~/Projects/watchtower_fork/container/mocks/data/image02.json
time="2019-06-13T20:58:36+02:00" level=error msg=~/Projects/watchtower_fork/container/mocks/data/container_running.json
time="2019-06-13T20:58:36+02:00" level=error msg=~/Projects/watchtower_fork/container/mocks/data/image01.json
•time="2019-06-13T20:58:36+02:00" level=error msg=~/Projects/watchtower_fork/container/mocks/data/containers.json
time="2019-06-13T20:58:36+02:00" level=error msg=~/Projects/watchtower_fork/container/mocks/data/container_stopped.json
time="2019-06-13T20:58:36+02:00" level=error msg=~/Projects/watchtower_fork/container/mocks/data/image02.json
time="2019-06-13T20:58:36+02:00" level=error msg=~/Projects/watchtower_fork/container/mocks/data/container_running.json
time="2019-06-13T20:58:36+02:00" level=error msg=~/Projects/watchtower_fork/container/mocks/data/image01.json
•time="2019-06-13T20:58:36+02:00" level=error msg=~/Projects/watchtower_fork/container/mocks/data/containers.json
time="2019-06-13T20:58:36+02:00" level=error msg=~/Projects/watchtower_fork/container/mocks/data/container_stopped.json
time="2019-06-13T20:58:36+02:00" level=error msg=~/Projects/watchtower_fork/container/mocks/data/image02.json
time="2019-06-13T20:58:36+02:00" level=error msg=~/Projects/watchtower_fork/container/mocks/data/container_running.json
time="2019-06-13T20:58:36+02:00" level=error msg=~/Projects/watchtower_fork/container/mocks/data/image01.json
•time="2019-06-13T20:58:36+02:00" level=error msg=~/Projects/watchtower_fork/container/mocks/data/containers.json
time="2019-06-13T20:58:36+02:00" level=error msg=~/Projects/watchtower_fork/container/mocks/data/container_stopped.json
time="2019-06-13T20:58:36+02:00" level=error msg=~/Projects/watchtower_fork/container/mocks/data/image02.json
time="2019-06-13T20:58:36+02:00" level=error msg=~/Projects/watchtower_fork/container/mocks/data/container_running.json
time="2019-06-13T20:58:36+02:00" level=error msg=~/Projects/watchtower_fork/container/mocks/data/image01.json
••••••••••••••••
Ran 20 of 20 Specs in 0.014 seconds
SUCCESS! -- 20 Passed | 0 Failed | 0 Pending | 0 Skipped
--- PASS: TestContainer (0.01s)
=== RUN   TestWatchtowerContainersFilter
--- PASS: TestWatchtowerContainersFilter (0.00s)
    filters_test.go:17: PASS:	IsWatchtower()
=== RUN   TestNoFilter
--- PASS: TestNoFilter (0.00s)
=== RUN   TestFilterByNames
--- PASS: TestFilterByNames (0.00s)
    filters_test.go:42: PASS:	Name()
    filters_test.go:47: PASS:	Name()
=== RUN   TestFilterByEnableLabel
--- PASS: TestFilterByEnableLabel (0.00s)
    filters_test.go:57: PASS:	Enabled()
    filters_test.go:62: PASS:	Enabled()
    filters_test.go:67: PASS:	Enabled()
=== RUN   TestFilterByDisabledLabel
--- PASS: TestFilterByDisabledLabel (0.00s)
    filters_test.go:77: PASS:	Enabled()
    filters_test.go:82: PASS:	Enabled()
    filters_test.go:87: PASS:	Enabled()
=== RUN   TestBuildFilter
--- PASS: TestBuildFilter (0.00s)
    filters_test.go:100: PASS:	Name()
    filters_test.go:100: PASS:	Enabled()
    filters_test.go:106: PASS:	Name()
    filters_test.go:106: PASS:	Enabled()
    filters_test.go:112: PASS:	Name()
    filters_test.go:112: PASS:	Enabled()
    filters_test.go:118: PASS:	Name()
    filters_test.go:118: PASS:	Enabled()
    filters_test.go:123: PASS:	Enabled()
=== RUN   TestBuildFilterEnableLabel
--- PASS: TestBuildFilterEnableLabel (0.00s)
    filters_test.go:135: PASS:	Enabled()
    filters_test.go:141: PASS:	Name()
    filters_test.go:141: PASS:	Enabled()
    filters_test.go:147: PASS:	Name()
    filters_test.go:147: PASS:	Enabled()
    filters_test.go:152: PASS:	Enabled()
=== RUN   TestEncodedEnvAuth_ShouldReturnAnErrorIfRepoEnvsAreUnset
--- PASS: TestEncodedEnvAuth_ShouldReturnAnErrorIfRepoEnvsAreUnset (0.00s)
=== RUN   TestEncodedEnvAuth_ShouldReturnAuthHashIfRepoEnvsAreSet
--- PASS: TestEncodedEnvAuth_ShouldReturnAuthHashIfRepoEnvsAreSet (0.00s)
=== RUN   TestEncodedConfigAuth_ShouldReturnAnErrorIfFileIsNotPresent
time="2019-06-13T20:58:36+02:00" level=error msg="Unable to find default config file /dev/null/should-fail/config.json: stat /dev/null/should-fail/config.json: not a directory"
--- PASS: TestEncodedConfigAuth_ShouldReturnAnErrorIfFileIsNotPresent (0.00s)
=== RUN   TestParseServerAddress_ShouldReturnErrorIfPassedEmptyString
--- PASS: TestParseServerAddress_ShouldReturnErrorIfPassedEmptyString (0.00s)
=== RUN   TestParseServerAddress_ShouldReturnTheRepoNameIfPassedAFullyQualifiedImageName
--- PASS: TestParseServerAddress_ShouldReturnTheRepoNameIfPassedAFullyQualifiedImageName (0.00s)
=== RUN   TestParseServerAddress_ShouldReturnTheOrganizationPartIfPassedAnImageNameMissingServerName
--- PASS: TestParseServerAddress_ShouldReturnTheOrganizationPartIfPassedAnImageNameMissingServerName (0.00s)
=== RUN   TestParseServerAddress_ShouldReturnTheServerNameIfPassedAFullyQualifiedImageName
--- PASS: TestParseServerAddress_ShouldReturnTheServerNameIfPassedAFullyQualifiedImageName (0.00s)
=== RUN   TestSliceEqual_True
--- PASS: TestSliceEqual_True (0.00s)
=== RUN   TestSliceEqual_DifferentLengths
--- PASS: TestSliceEqual_DifferentLengths (0.00s)
=== RUN   TestSliceEqual_DifferentContents
--- PASS: TestSliceEqual_DifferentContents (0.00s)
=== RUN   TestSliceSubtract
--- PASS: TestSliceSubtract (0.00s)
=== RUN   TestStringMapSubtract
--- PASS: TestStringMapSubtract (0.00s)
=== RUN   TestStructMapSubtract
--- PASS: TestStructMapSubtract (0.00s)
PASS
ok  	github.com/containrrr/watchtower/container	(cached)
?   	github.com/containrrr/watchtower/container/mocks	[no test files]
?   	github.com/containrrr/watchtower/notifications	[no test files]

simskij

Thanks a bunch for contributing! Really appreciate it.
Looks really good. If you dont mind, I'd appreciate if you'd add a test case for the new option as well.

Thanks again 🙏

simskij · 2019-06-13T20:46:43Z

@all-contributors add @zoispag for code

allcontributors · 2019-06-13T20:46:56Z

@simskij

I've put up a pull request to add @zoispag! 🎉

zoispag · 2019-06-13T20:58:07Z

@simskij I certainly don't mind! I will take a look to figure out exactly how. If I encounter any issue I will let you know! 🙏

Cheers!

simskij · 2019-07-20T16:38:22Z

Hi again @zoispag,

Can I assist You in any way to get this out the door?

Thanks again,
Simon

zoispag · 2019-07-21T11:48:01Z

Hi @simskij,

i tried to add a new test case, but i stumbled upon some issues with the mockClient and how to mount volume in a mock container :(

This was some time ago and since then I didn't have too much spare time to work on this.
So helping with the test would be highly appreciated.

Thanks,
Zois

update fork

zoispag · 2019-07-21T13:19:11Z

@simskij I updated the branch and resolved the conflicts.
Still no progress with the tests though!

welcome · 2019-07-21T16:01:01Z

Congrats on merging your first pull request! We are all very proud of you! ✨

simskij requested changes Jun 13, 2019

View reviewed changes

allcontributors bot mentioned this pull request Jun 13, 2019

docs: add zoispag as a contributor #337

Merged

zoispag added 2 commits July 21, 2019 14:12

Merge pull request #1 from containrrr/master

c9770b0

update fork

Re-apply based on new go flags package

127ebfa

simskij approved these changes Jul 21, 2019

View reviewed changes

simskij merged commit baf5e50 into containrrr:master Jul 21, 2019

zoispag deleted the feat/190_remove_volumes_on_container_stop branch July 21, 2019 20:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add argument to delete volumes on container remove #336

Add argument to delete volumes on container remove #336

zoispag commented Jun 13, 2019

welcome bot commented Jun 13, 2019

zoispag commented Jun 13, 2019

simskij left a comment

simskij commented Jun 13, 2019

allcontributors bot commented Jun 13, 2019

zoispag commented Jun 13, 2019

simskij commented Jul 20, 2019

zoispag commented Jul 21, 2019

zoispag commented Jul 21, 2019

welcome bot commented Jul 21, 2019

Add argument to delete volumes on container remove #336

Add argument to delete volumes on container remove #336

Conversation

zoispag commented Jun 13, 2019

welcome bot commented Jun 13, 2019

zoispag commented Jun 13, 2019

simskij left a comment

Choose a reason for hiding this comment

simskij commented Jun 13, 2019

allcontributors bot commented Jun 13, 2019

zoispag commented Jun 13, 2019

simskij commented Jul 20, 2019

zoispag commented Jul 21, 2019

zoispag commented Jul 21, 2019

welcome bot commented Jul 21, 2019