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 'environ' is defined on *nix, make a dropin systemd config to set … #322

Closed
wants to merge 0 commits into from

Conversation

benfiedler
Copy link

@benfiedler benfiedler commented Feb 12, 2023

…it as EnvironmentFile

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

#317

Describe the changes you're proposing

Create+manage a systemd dropin file if 'environ' pillar is configured to ensure the environ file (/etc/default/docker) is being used by the docker service. A systemd daemon-reload will be run if salt detects changes in the override file, and the docker service will be restarted if salt detects changes in the environ file.

Pillar / config required to test the proposed changes

docker:
  pkg: 
    docker:
      daemon_config:
        insecure-registries:
          - my.repo.local:5000
      environ:
        - HTTP_PROXY=http://my.proxy.local:3128/
        - HTTPS_PROXY=http://my.proxy.local:3128/
        - NO_PROXY="localhost,127.0.0.1,.local"
      use_upstream:
        repo
  wanted:
    - docker

docker/defaults.yaml
docker/software/config/clean.sls
docker/software/config/dropin.sls
docker/software/config/init.sls
docker/software/service/running.sls

Debug log showing how the proposed changes work

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

@voileux
Copy link

voileux commented Feb 13, 2023

@benfiedler
you must respect the commit message format for you pull request
you can find the documentation here : https://github.com/saltstack-formulas/.github/blob/master/CONTRIBUTING.rst#commit-message-formatting

@benfiedler benfiedler closed this Jun 30, 2023
@benfiedler benfiedler force-pushed the master branch 2 times, most recently from b131392 to da37c28 Compare June 30, 2023 20:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants