Skip to content

Conversation

noelmcloughlin
Copy link
Contributor

@noelmcloughlin noelmcloughlin commented Feb 21, 2019

This PR evolves formula while avoiding regression - this PR builds on #194 and supersedes #186
UPDATE: Resolves #200
UPDATE 2: Resolves #205

defaults.yaml Improvements

  • Populate pkgs list with common package names across all supported distros.
  • Depreciate pip.pkgname (handled by osfamilymap.yaml instead).

init.sls Improvements

  • Remove hard-coding of package names in pkg.installed.
  • Add refresh to pkg.installed
  • Remove docker-py requirements state (see docker-package-dependencies instead).
  • Add docker-py.pip.installed: pip in case someone REALLY needs pypi pip (pillar triggered).

compose.sls Cleanup

  • Remove superfluous compose.docker-compose-pip state (already handled by init.sls).
  • Add require: pkg: docker.docker-package-dependencies so we depend on init.sls

osfamilymap.yaml Cleanup

  • Remove common package names - they exist in default.yaml instead
  • Depreciate pip.pkgname.

osmap.yaml Cleanup

  • Depreciate pip.pkgname

pillar.example Cleanup

  • Depreciate pip.pkgname - its still supported (in case its used) but must not be documented

@noelmcloughlin
Copy link
Contributor Author

I'll investigate Travis CI jobs - might be related to #182 and other stuff.

@noelmcloughlin
Copy link
Contributor Author

Added commit to use python3-pip on Suse (see #198)

@noelmcloughlin
Copy link
Contributor Author

Travis is broken on this formula - failures are not PR related.

@noelmcloughlin
Copy link
Contributor Author

Last commit is workaround for broken pip states on Python3 and/or Suse 15.0.

See: #198

  ID: docker-package
    Function: cmd.run
        Name: /usr/bin/pip install  pip
      Result: True
     Comment: onlyif condition is false
     Started: 09:08:45.842677
    Duration: 0.773 ms
     Changes:

@myii
Copy link
Contributor

myii commented Feb 23, 2019

@noelmcloughlin Thanks for this. Just a quick eyeball review for now.

@mattwillsher
Copy link

FWIW this fixed the install issue I was having running the formula against Ubuntu Bionic:

2019-03-06 20:25:30,088 [salt.state       :3487][CRITICAL][22093] Rendering SLS 'base:docker' failed: while parsing a blo
ck mapping
  in "<unicode string>", line 25, column 7
did not find expected key
  in "<unicode string>", line 26, column 7

@noelmcloughlin
Copy link
Contributor Author

Thanks @mattwillsher for testing the PR

@aboe76 @javierbertoli @myii Are you happy to merge? There is also a growing backlog of issues for this formula and travis is broken too. I have tested this PR many times without issue.

@noelmcloughlin
Copy link
Contributor Author

noelmcloughlin commented Mar 6, 2019

BTW FWIW there is interesting gotcha regarding kernel and dockerd documented here.

If you execute yum\apt\zypper update via CLI the kernel may get upgraded (but you are not warned). The Dockerd daemon fails with obscure iptables errors until you reboot!!!

@noelmcloughlin
Copy link
Contributor Author

Resolves #205 too.

@javierbertoli javierbertoli merged commit 3fce8f0 into saltstack-formulas:master Mar 7, 2019
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.

4 participants