Skip to content

Conversation

@hatifnatt
Copy link
Contributor

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

Describe the changes you're proposing

Install docker package (Python library for the Docker Engine API) with pip in docker installation states:

  • docker.software.archive.install
  • docker.software.package.install
    not only docker-compose installation state like before:
  • docker.compose.software.binary.install

docker/compose/ng.sls
No reason to install packages while pulling docker image

docker/software/archive/install.sls
docker/software/package/install.sls
docker/compose/software/binary/install.sls
Install pip package after system packages
Reload modules
Actual for RedHat too

Pillar / config required to test the proposed changes

N/A

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

simultaneously with docker package

docker/compose/ng.sls
No reason to install packages while pulling docker image

docker/software/archive/install.sls
docker/software/package/install.sls
docker/compose/software/binary/install.sls
Install pip package after system packages
Reload modules
Actual for RedHat too
@hatifnatt hatifnatt force-pushed the install-python-docker-with-pip branch from 482cc19 to 7d73e8a Compare March 10, 2021 20:02
@myii myii requested a review from noelmcloughlin March 10, 2021 20:04
Copy link
Contributor

@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.

Good PR, CI passing. Fixes #salt/58920 here. thanks @hatifnatt

@noelmcloughlin noelmcloughlin merged commit fbea378 into saltstack-formulas:master Apr 21, 2021
@saltstack-formulas-travis

🎉 This PR is included in version 2.0.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@hatifnatt
Copy link
Contributor Author

@noelmcloughlin

Fixes #salt/58920
I don't think so, in my test playground Salt still can't communicate with docker without salt-minion restart.

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