Code

Update to master branch#1

Code

Merged

acalv merged 78 commits intoacalv:masteracalv/docker-formula:masterfrom saltstack-formulas:mastersaltstack-formulas/docker-formula:masterCopy head branch name to clipboardApr 3, 2020

+1,730-504

Commits

Commits on Feb 12, 2019

• passing the hold and allow_updated to docker pkg.installed

  tyhunt99

  committed
  112a376

• accessing correct level of config

  tyhunt99

  committed
  1646765

Commits on May 30, 2019

• Fix rendering error on MacOS ('oscodename')

  noelmcloughlin

  committed
  e2b1e79

• Docker is brew name

  noelmcloughlin

  committed
  5f7db53

• No upstart/sysv on Darwin

  noelmcloughlin

  committed
  a96c4c2

Commits on Jun 23, 2019

• Merge branch 'master' into master

  noelmcloughlin

  authored
  ae7b707

• Merge pull request #193 from tyhunt99/master

  Show description for f7dd453
  noelmcloughlin

  authored
  f7dd453

• Merge branch 'master' into fixes2

  noelmcloughlin

  authored
  e297ddf

• Merge pull request #208 from noelmcloughlin/fixes2

  Show description for 5c29dbd
  noelmcloughlin

  authored
  5c29dbd

Commits on Jul 2, 2019

• chore(python): use python3 apt packages

  noelmcloughlin

  committed
  6b1b5fe

Commits on Jul 3, 2019

• fix(syntax): param 'refresh' replaces 'refresh_db'

  noelmcloughlin

  committed
  9064121

• Merge pull request #211 from noelmcloughlin/repo

  Show description for 59810ad
  myii

  authored
  59810ad

Commits on Jul 4, 2019

• Using the tplroot method (borrowed from the ufw-formula) prevents having to set --extra-filerefs when using the formula with salt-ssh.

  VBH-Jenkins

  committed
  7d900fa

• Updating apt (ubuntu/debian) resulted in the following error:

  Show description for 9193df0
  VBH-Jenkins

  committed
  9193df0

• Updating apt (ubuntu/debian) resulted in the following error:

  Show description for a245db5
  VBH-Jenkins

  committed
  a245db5

• Merge remote-tracking branch 'origin/master'

  Show description for f7ace8c
  VBH-Jenkins

  committed
  f7ace8c

• Merge pull request #214 from remichristiaan/master

  Show description for 9b8feb3
  noelmcloughlin

  authored
  9b8feb3

• Revert "Make it easier when using salt-ssh"

  noelmcloughlin

  authored
  39577e2

• Merge pull request #215 from saltstack-formulas/revert-214-master

  Show description for fa8aec4
  noelmcloughlin

  authored
  fa8aec4

Commits on Jul 5, 2019

• Use tpldir to make imports work from e.g. salt-ssh without having to resort to --extra-filerefs=salt://docker/map.jinja,... on the cmd line.

  Show description for 0253e6e
  VBH-Jenkins

  committed
  0253e6e

Commits on Jul 9, 2019

• fix(sls): avoid unnecessary rendering error

  noelmcloughlin

  committed
  9b139aa

• doc(clean): make remove alias for clean

  noelmcloughlin

  committed
  b0ce436

• fix(merge): workaround broken map.jinja merge

  noelmcloughlin

  committed
  be9a769

• Merge branch 'master' into broken_merge

  noelmcloughlin

  authored
  79faa17

• chore(template): align osmap with template-formula

  noelmcloughlin

  committed
  71b46bd

• Merge branch 'master' into osfamily

  noelmcloughlin

  authored
  9ed1016

• feat(macos): docker desktop for mac support

  noelmcloughlin

  committed
  8d61745

• doc(clean): make remove alias for clean

  noelmcloughlin

  committed
  e0cccf4

• chore(template): align osmap with template-formula

  noelmcloughlin

  committed
  1ac9968

• feat(macos): docker desktop for mac support

  noelmcloughlin

  committed
  f60c1c7

Commits on Jul 10, 2019

• Merge pull request #217 from noelmcloughlin/rendering_error

  Show description for 95a1244
  myii

  authored
  95a1244

Commits on Jul 11, 2019

• Merge branch 'master' into desktop-for-mac

  noelmcloughlin

  authored
  d538679

Commits on Jul 17, 2019

• pillar.example registry-mirrors

  greut

  authored
  5baf6d2

Commits on Jul 19, 2019

• Merge pull request #212 from noelmcloughlin/python3

  Show description for b4b05c1
  noelmcloughlin

  authored
  b4b05c1

• Merge pull request #220 from noelmcloughlin/broken_merge

  Show description for 2f2282b
  noelmcloughlin

  authored
  2f2282b

• Merge pull request #218 from noelmcloughlin/clean

  Show description for 2b23c4a
  noelmcloughlin

  authored
  2b23c4a

• Merge branch 'master' into osfamily

  noelmcloughlin

  authored
  09c9a1f

• Merge pull request #221 from noelmcloughlin/osfamily

  Show description for cb2ba06
  noelmcloughlin

  authored
  cb2ba06

• Merge branch 'master' into desktop-for-mac

  noelmcloughlin

  authored
  732f269

• Merge pull request #222 from noelmcloughlin/desktop-for-mac

  Show description for 9a5970f
  noelmcloughlin

  authored
  9a5970f

• Merge branch 'master' into master

  noelmcloughlin

  authored
  194456b

• Merge pull request #216 from remichristiaan/master

  Show description for 89c07be
  noelmcloughlin

  authored
  89c07be

• Merge pull request #223 from greut/patch-1

  Show description for 947b062
  noelmcloughlin

  authored
  947b062

Commits on Jul 22, 2019

• fix(install): resolve #224

  noelmcloughlin

  committed
  145967c

• refactor(init): remove duplicated jinja

  noelmcloughlin

  committed
  00353cf

• Update docker/install.sls

  Show description for 2bbed5c
  

  noelmcloughlin

  and

  myii

  authored
  2bbed5c

• Merge pull request #227 from noelmcloughlin/dups

  Show description for c9b24e1
  noelmcloughlin

  authored
  c9b24e1

• Merge pull request #226 from noelmcloughlin/fix

  Show description for 3a637c7
  myii

  authored
  3a637c7

Commits on Aug 17, 2019

• feat(linux): archlinux support (#229)

  

  noelmcloughlin

  authored and

  aboe76

  committed
  71ee3c4

Commits on Oct 16, 2019

• feat(semantic-release): implement for this formula

  Show description for ea6be11
  myii

  committed
  ea6be11

• fix(compose-ng.sls): fix salt-lint errors

  Show description for 9e8e1e8
  myii

  committed
  9e8e1e8

• test(testinfra): remove from the formula

  myii

  committed
  62122d2

• test(inspec): add tests for package, config & service

  myii

  committed
  451d76d

• fix(pillar.example): ensure docker.config is available

  myii

  committed
  dce112a

Commits on Oct 17, 2019

• docs(readme): move to docs/ directory and modify accordingly

  myii

  committed
  222fc6d

Commits on Oct 23, 2019

• ci(travis): update salt-lint config for v0.0.10

  Show description for 3eaed1b
  myii

  committed
  3eaed1b

• Merge pull request #235 from myii/feat/implement-semantic-release

  Show description for d71e747
  myii

  authored
  d71e747

• chore(release): 0.42.0 [skip ci]

  Show description for 3fa1e4f
  semantic-release-bot

  committed
  3fa1e4f

Commits on Oct 24, 2019

• ci(kitchen): use debian-10-master-py3 instead of develop [skip ci]

  Show description for d87e787
  myii

  committed
  d87e787

Commits on Oct 30, 2019

• ci(kitchen+travis): upgrade matrix after 2019.2.2 release [skip ci]

  Show description for 2189efb
  myii

  committed
  2189efb

Commits on Oct 31, 2019

• fix(release.config.js): use full commit hash in commit link [skip ci]

  Show description for 01ece3d
  myii

  committed
  01ece3d

Commits on Nov 2, 2019

• perf(travis): improve salt-lint invocation [skip ci]

  Show description for 18fa798
  myii

  committed
  18fa798

Commits on Nov 3, 2019

• ci(kitchen): use develop image until master is ready (amazonlinux) [skip ci]

  Show description for 71c5bcb
  myii

  committed
  71c5bcb

Commits on Nov 13, 2019

• ci(travis): use build config validation (beta) [skip ci]

  Show description for fe184e9
  myii

  committed
  fe184e9

Commits on Nov 16, 2019

• ci(travis): apply changes from build config validation [skip ci]

  Show description for f0a07fc
  myii

  committed
  f0a07fc

Commits on Nov 20, 2019

• ci(travis): opt-in to dpl v2 to complete build config validation [skip ci]

  Show description for 340556e
  myii

  committed
  340556e

Commits on Nov 27, 2019

• ci(travis): run shellcheck during lint job [skip ci]

  Show description for ba127a0
  myii

  committed
  ba127a0

• ci(travis): quote pathspecs used with git ls-files [skip ci]

  Show description for 12bf914
  myii

  committed
  12bf914

Commits on Dec 16, 2019

• ci(gemfile): restrict train gem version until upstream fix [skip ci]

  Show description for 734d4e3
  myii

  committed
  734d4e3

Commits on Dec 22, 2019

• ci(travis): use major.minor for semantic-release version [skip ci]

  Show description for 2590d61
  myii

  committed
  2590d61

Commits on Jan 22, 2020

• feat: support optional container removal before start in upstart/systemd

  solarchad

  committed
  cc10d97

• Merge pull request #238 from solarchad/support-rm-container-prestart

  Show description for 6bf1642
  myii

  authored
  6bf1642

• chore(release): 0.43.0 [skip ci]

  Show description for 15c803d
  semantic-release-bot

  committed
  15c803d

• fix: avoid setting multiple pre-start stanzas in upstart

  solarchad

  committed
  80a2a98

• Merge pull request #239 from solarchad/support-rm-container-prestart-upstart-fix

  Show description for 13c1c20
  myii

  authored
  13c1c20

Commits on Feb 5, 2020

• ci(kitchen): avoid using bootstrap for master instances [skip ci]

  Show description for 27b509e
  myii

  committed
  27b509e

Commits on Feb 14, 2020

• chore(rubocop): move LineLength cop from Metrics to Layout [skip ci]

  Show description for 7de17e2
  myii

  committed
  7de17e2

• chore(gitignore): update from the template-formula [skip ci]

  Show description for c3c4eb8
  myii

  committed
  c3c4eb8