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

fix(service): reload the docker service when daemon.json has changed #289

Conversation

danny-smit
Copy link
Collaborator

PR progress checklist (to be filled in by reviewers)

  • Changes to documentation are appropriate (or tick if not required)
  • Changes to tests are appropriate (or tick if not required)
  • Reviews completed

What type of PR is this?

Primary type

  • [build] Changes related to the build system
  • [chore] Changes to the build process or auxiliary tools and libraries such as documentation generation
  • [ci] Changes to the continuous integration configuration
  • [feat] A new feature
  • [fix] A bug fix
  • [perf] A code change that improves performance
  • [refactor] A code change that neither fixes a bug nor adds a feature
  • [revert] A change used to revert a previous commit
  • [style] Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc.)

Secondary type

  • [docs] Documentation changes
  • [test] Adding missing or correcting existing tests

Does this PR introduce a BREAKING CHANGE?

No.

Related issues and/or pull requests

Follow up of #282

Describe the changes you're proposing

Ensure that the docker daemon is reloaded when changes are applied to the daemon.json.

Pillar / config required to test the proposed changes

docker:
  pkg:
    docker:
      daemon_config:
        insecure-registries:
          - dockerhost.test.home:443

Debug log showing how the proposed changes work

The 'watch' added to the 'service.running' state causes the service to be restarted:

          ID: docker-software-service-running-docker
    Function: service.running
        Name: docker
      Result: True
     Comment: Service restarted
     Started: 13:55:09.038487
    Duration: 466.054 ms
     Changes:   
              ----------
              docker:
                  True

Documentation checklist

  • Updated the README (e.g. Available states).
  • Updated pillar.example.

Testing checklist

  • Included in Kitchen (i.e. under state_top).
  • Covered by new/existing tests (e.g. InSpec, Serverspec, etc.).
  • Updated the relevant test pillar.

Additional context

Current tests execute a clean installation. The problem occurs when salt runs a second time with configuration changes for the daemon.json. It is difficult to get this included in the tests.

@danny-smit danny-smit force-pushed the bugfix_reload_docker_after_configuration_change branch from 2926850 to b34f434 Compare May 19, 2021 15:23
@myii myii mentioned this pull request May 19, 2021
Copy link
Member

@noelmcloughlin noelmcloughlin left a comment

Choose a reason for hiding this comment

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

LGTM. thanks @danny-smit

@danny-smit
Copy link
Collaborator Author

@noelmcloughlin Thanks for reviewing
@noelmcloughlin and @myii What is the correct procedure to get this pull request merged?

@noelmcloughlin
Copy link
Member

I just wait a day or two for any objections - or someone else to take initiative in merging. Happy to merge now!!

@noelmcloughlin noelmcloughlin merged commit a28379e into saltstack-formulas:master May 21, 2021
@saltstack-formulas-travis

🎉 This PR is included in version 2.0.6 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@danny-smit
Copy link
Collaborator Author

@noelmcloughlin Thanks for explaining and merging!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants