Skip to content
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

If the 'docker' group exists, append the 'dd-agent' user to it #364

Merged
merged 2 commits into from Sep 22, 2016

Conversation

Projects
None yet
2 participants
@jvrplmlmn
Copy link
Contributor

jvrplmlmn commented Sep 21, 2016

Closes #363

@jvrplmlmn jvrplmlmn force-pushed the jvrplmlmn:add-ddagent-to-docker-group branch from b278983 to 0c86e86 Sep 21, 2016

@jvrplmlmn

This comment has been minimized.

Copy link
Contributor Author

jvrplmlmn commented Sep 21, 2016

@olivielpeau I think that you're an owner of this repository.

@olivielpeau
Copy link
Member

olivielpeau left a comment

Thanks @jvrplmlmn! Your changes look good.

Could you also add a test for this in spec/integrations/docker_daemon_spec.rb?

A test like it { is_expected.to manage_group('docker').with(append: true, members: ['dd-agent']) } should work.

@olivielpeau olivielpeau added this to the 2.7.0 milestone Sep 21, 2016

@jvrplmlmn

This comment has been minimized.

Copy link
Contributor Author

jvrplmlmn commented Sep 21, 2016

CircleCI seems to have failed for an issue non related to this change. Can you rebuild it or do I need to rewrite the commit to trigger it again?

@olivielpeau olivielpeau added the ready label Sep 21, 2016

@olivielpeau

This comment has been minimized.

Copy link
Member

olivielpeau commented Sep 21, 2016

@jvrplmlmn I've rebuilt the CircleCI job, the tests seem a little flaky there, I'll look into them if the issue persists.

I'll merge as soon as the tests pass. Thanks!

@jvrplmlmn

This comment has been minimized.

Copy link
Contributor Author

jvrplmlmn commented Sep 21, 2016

@olivielpeau Tests are now passing! Any chance that we could have a 2.6.1 version released? Otherwise I'll wait to 2.7.0.

@olivielpeau

This comment has been minimized.

Copy link
Member

olivielpeau commented Sep 22, 2016

@jvrplmlmn thanks, merging!

Since this is more an improvement than a bugfix I'd rather release this with the next minor, 2.7.0, once we have enough features ready. You can definitely use your own fork of the cookbook until then, hope that's not too much of a hassle for you.

@olivielpeau olivielpeau merged commit bb01095 into DataDog:master Sep 22, 2016

2 checks passed

ci/circleci Your tests passed on CircleCI!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@jvrplmlmn jvrplmlmn deleted the jvrplmlmn:add-ddagent-to-docker-group branch Sep 27, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.