Update to master branch #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Allow use of `hold` and `allow_updates` parameters` for docker pkg.installed
Fix errors on MacOS ('oscodename', configfile)
fix(syntax): param 'refresh' replaces 'refresh_db'
…ing to set --extra-filerefs when using the formula with salt-ssh.
Skipping acquire of configured file 'stable/binary-i386/Packages' as repository 'https://download.docker.com/linux/ubuntu bionic InRelease' doesn't support architecture 'i386' Adding [arch=<osarch>] between deb and https solved this problem.
Skipping acquire of configured file 'stable/binary-i386/Packages' as repository 'https://download.docker.com/linux/ubuntu bionic InRelease' doesn't support architecture 'i386' Adding [arch=<osarch>] between deb and https solved this problem.
# Conflicts: # docker/repo.sls
Make it easier when using salt-ssh
Revert "Make it easier when using salt-ssh"
…resort to --extra-filerefs=salt://docker/map.jinja,... on the cmd line. Also added the os architecture to the apt sources.list line: deb [arch=<osarch>] http://...
* Semi-automated using myii/ssf-formula#78 * Fix (or ignore) `yamllint` errors: ```bash docker-formula$ yamllint -s . ./pillar.example 5:1 warning missing document start "---" (document-start) 10:8 warning missing starting space in comment (comments) 12:11 error empty value in block mapping (empty-values) 13:89 error line too long (92 > 88 characters) (line-length) 14:26 warning truthy value should be one of [false, true] (truthy) 28:1 error trailing spaces (trailing-spaces) 32:11 error empty value in block mapping (empty-values) 36:89 error line too long (92 > 88 characters) (line-length) 37:26 warning truthy value should be one of [false, true] (truthy) 58:4 warning missing starting space in comment (comments) 59:4 warning missing starting space in comment (comments) 61:4 warning missing starting space in comment (comments) 62:4 warning missing starting space in comment (comments) 63:21 warning truthy value should be one of [false, true] (truthy) 64:1 error trailing spaces (trailing-spaces) 65:89 error line too long (93 > 88 characters) (line-length) 66:4 warning missing starting space in comment (comments) 76:3 warning comment not indented like content (comments-indentation) 77:6 warning missing starting space in comment (comments) 78:6 warning missing starting space in comment (comments) 79:23 warning truthy value should be one of [false, true] (truthy) 87:20 warning truthy value should be one of [false, true] (truthy) 88:20 warning truthy value should be one of [false, true] (truthy) 92:12 warning truthy value should be one of [false, true] (truthy) 111:8 warning missing starting space in comment (comments) 119:4 error syntax error: expected <block end>, but found '<block mapping start>' 120:8 warning missing starting space in comment (comments) 121:7 error wrong indentation: expected 5 but found 6 (indentation) 132:8 warning missing starting space in comment (comments) 145:2 warning missing starting space in comment (comments) 147:5 warning comment not indented like content (comments-indentation) 148:6 warning missing starting space in comment (comments) 149:6 warning missing starting space in comment (comments) 150:6 warning missing starting space in comment (comments) 154:6 warning missing starting space in comment (comments) 155:6 warning missing starting space in comment (comments) 157:2 warning missing starting space in comment (comments) 159:6 warning comment not indented like content (comments-indentation) 169:6 warning comment not indented like content (comments-indentation) 174:1 error too many blank lines (1 > 0) (empty-lines) ./docker/defaults.yaml 3:1 warning missing document start "---" (document-start) 5:22 warning truthy value should be one of [false, true] (truthy) 7:17 warning truthy value should be one of [false, true] (truthy) 14:22 warning truthy value should be one of [false, true] (truthy) 15:17 warning truthy value should be one of [false, true] (truthy) 16:10 warning truthy value should be one of [false, true] (truthy) 27:20 warning truthy value should be one of [false, true] (truthy) 28:11 warning truthy value should be one of [false, true] (truthy) 29:23 warning truthy value should be one of [false, true] (truthy) 29:35 warning missing starting space in comment (comments) 32:23 warning truthy value should be one of [false, true] (truthy) 33:14 warning truthy value should be one of [false, true] (truthy) 39:20 warning truthy value should be one of [false, true] (truthy) 40:20 warning truthy value should be one of [false, true] (truthy) 46:1 error too many blank lines (1 > 0) (empty-lines) ./docker/osfamilymap.yaml 13:2 error syntax error: found character '%' that cannot start any token 50:89 error line too long (164 > 88 characters) (line-length) ./docker/codenamemap.yaml 3:1 warning missing document start "---" (document-start) 36:1 error too many blank lines (1 > 0) (empty-lines) ./docker/osmap.yaml 1:1 error too many blank lines (1 > 0) (empty-lines) 2:1 warning missing document start "---" (document-start) (saltstack) imran@E6530:~/Salt/formulas/docker-formula$ yamllint -s . ./docker/osfamilymap.yaml 13:2 error syntax error: found character '%' that cannot start any token 51:89 error line too long (164 > 88 characters) (line-length) ```
```bash
Examining docker/compose-ng.sls of type state
[206] Jinja variables should have spaces before and after: {{ var_name }}
docker/compose-ng.sls:13
{{id}}:
[206] Jinja variables should have spaces before and after: {{ var_name }}
docker/compose-ng.sls:17
{{id}} image:
[206] Jinja variables should have spaces before and after: {{ var_name }}
docker/compose-ng.sls:22
- name: {{image[0]}}
[206] Jinja variables should have spaces before and after: {{ var_name }}
docker/compose-ng.sls:23
- tag: {{image[1]}}
[206] Jinja variables should have spaces before and after: {{ var_name }}
docker/compose-ng.sls:25
- name: {{container.image}}
[206] Jinja variables should have spaces before and after: {{ var_name }}
docker/compose-ng.sls:28
{{id}} container:
[206] Jinja variables should have spaces before and after: {{ var_name }}
docker/compose-ng.sls:40
- name: {{id}}
[206] Jinja variables should have spaces before and after: {{ var_name }}
docker/compose-ng.sls:41
- image: {{container.image}}
[206] Jinja variables should have spaces before and after: {{ var_name }}
docker/compose-ng.sls:43
- command: {{container.command}}
[206] Jinja variables should have spaces before and after: {{ var_name }}
docker/compose-ng.sls:48
- {{variable}}: {{value}}
[206] Jinja variables should have spaces before and after: {{ var_name }}
docker/compose-ng.sls:57
- "{{mapping[0]}}"
[206] Jinja variables should have spaces before and after: {{ var_name }}
docker/compose-ng.sls:59
- "{{mapping[-1]}}/tcp":
[206] Jinja variables should have spaces before and after: {{ var_name }}
docker/compose-ng.sls:60
HostPort: "{{mapping[-2]}}"
[206] Jinja variables should have spaces before and after: {{ var_name }}
docker/compose-ng.sls:61
HostIp: "{{mapping[-3]|d('')}}"
[206] Jinja variables should have spaces before and after: {{ var_name }}
docker/compose-ng.sls:64
- {{port_mapping}}
[206] Jinja variables should have spaces before and after: {{ var_name }}
docker/compose-ng.sls:71
- {{volume}}
[206] Jinja variables should have spaces before and after: {{ var_name }}
docker/compose-ng.sls:78
- {{volume}}
[206] Jinja variables should have spaces before and after: {{ var_name }}
docker/compose-ng.sls:86
{{name}}: {{alias}}
[206] Jinja variables should have spaces before and after: {{ var_name }}
docker/compose-ng.sls:92
Name: {{policy[0]}}
[206] Jinja variables should have spaces before and after: {{ var_name }}
docker/compose-ng.sls:94
MaximumRetryCount: {{policy[1]}}
[206] Jinja variables should have spaces before and after: {{ var_name }}
docker/compose-ng.sls:99
- docker_image: {{id}}
[206] Jinja variables should have spaces before and after: {{ var_name }}
docker/compose-ng.sls:101
- docker: {{id}} image
[206] Jinja variables should have spaces before and after: {{ var_name }}
docker/compose-ng.sls:106
- docker_image: {{containerid}}
[206] Jinja variables should have spaces before and after: {{ var_name }}
docker/compose-ng.sls:108
- docker: {{containerid}}
```
* Automated using myii/ssf-formula#82
feat(semantic-release): implement for this formula
# [0.42.0](v0.41.0...v0.42.0) (2019-10-23) ### Bug Fixes * **compose-ng.sls:** fix `salt-lint` errors ([](9e8e1e8)) * **pillar.example:** ensure `docker.config` is available ([](dce112a)) ### Continuous Integration * **travis:** update `salt-lint` config for `v0.0.10` ([](3eaed1b)) ### Documentation * **readme:** move to `docs/` directory and modify accordingly ([](222fc6d)) ### Features * **semantic-release:** implement for this formula ([](ea6be11)) ### Tests * **inspec:** add tests for package, config & service ([](451d76d)) * **testinfra:** remove from the formula ([](62122d2))
* Automated using myii/ssf-formula#90
…x`) [skip ci] * Automated using myii/ssf-formula#93
…kip ci] * Automated using myii/ssf-formula#100
* Automated using myii/ssf-formula#106
Optionally support removing container before trying to start it
# [0.43.0](v0.42.0...v0.43.0) (2020-01-22) ### Bug Fixes * **release.config.js:** use full commit hash in commit link [skip ci] ([01ece3d](01ece3d)) ### Continuous Integration * **gemfile:** restrict `train` gem version until upstream fix [skip ci] ([734d4e3](734d4e3)) * **kitchen:** use `debian-10-master-py3` instead of `develop` [skip ci] ([d87e787](d87e787)) * **kitchen:** use `develop` image until `master` is ready (`amazonlinux`) [skip ci] ([71c5bcb](71c5bcb)) * **kitchen+travis:** upgrade matrix after `2019.2.2` release [skip ci] ([2189efb](2189efb)) * **travis:** apply changes from build config validation [skip ci] ([f0a07fc](f0a07fc)) * **travis:** opt-in to `dpl v2` to complete build config validation [skip ci] ([340556e](340556e)) * **travis:** quote pathspecs used with `git ls-files` [skip ci] ([12bf914](12bf914)) * **travis:** run `shellcheck` during lint job [skip ci] ([ba127a0](ba127a0)) * **travis:** use `major.minor` for `semantic-release` version [skip ci] ([2590d61](2590d61)) * **travis:** use build config validation (beta) [skip ci] ([fe184e9](fe184e9)) ### Features * support optional container removal before start in upstart/systemd ([cc10d97](cc10d97)) ### Performance Improvements * **travis:** improve `salt-lint` invocation [skip ci] ([18fa798](18fa798))
…upstart-fix fix: avoid setting multiple pre-start stanzas in upstart
…p ci] * Automated using myii/ssf-formula#129
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Mergin with saltstack main branch