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

Update to master branch #1

Merged
merged 78 commits into from
Apr 3, 2020
Merged
Changes from 1 commit
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
112a376
passing the hold and allow_updated to docker pkg.installed
tyhunt99 Feb 12, 2019
1646765
accessing correct level of config
tyhunt99 Feb 12, 2019
e2b1e79
Fix rendering error on MacOS ('oscodename')
noelmcloughlin May 30, 2019
5f7db53
Docker is brew name
noelmcloughlin May 30, 2019
a96c4c2
No upstart/sysv on Darwin
noelmcloughlin May 30, 2019
ae7b707
Merge branch 'master' into master
noelmcloughlin Jun 23, 2019
f7dd453
Merge pull request #193 from tyhunt99/master
noelmcloughlin Jun 23, 2019
e297ddf
Merge branch 'master' into fixes2
noelmcloughlin Jun 23, 2019
5c29dbd
Merge pull request #208 from noelmcloughlin/fixes2
noelmcloughlin Jun 23, 2019
6b1b5fe
chore(python): use python3 apt packages
noelmcloughlin Jul 2, 2019
9064121
fix(syntax): param 'refresh' replaces 'refresh_db'
noelmcloughlin Jul 2, 2019
59810ad
Merge pull request #211 from noelmcloughlin/repo
myii Jul 3, 2019
7d900fa
Using the tplroot method (borrowed from the ufw-formula) prevents hav…
VBH-Jenkins Jul 4, 2019
9193df0
Updating apt (ubuntu/debian) resulted in the following error:
VBH-Jenkins Jul 4, 2019
a245db5
Updating apt (ubuntu/debian) resulted in the following error:
VBH-Jenkins Jul 4, 2019
f7ace8c
Merge remote-tracking branch 'origin/master'
VBH-Jenkins Jul 4, 2019
9b8feb3
Merge pull request #214 from remichristiaan/master
noelmcloughlin Jul 4, 2019
39577e2
Revert "Make it easier when using salt-ssh"
noelmcloughlin Jul 4, 2019
fa8aec4
Merge pull request #215 from saltstack-formulas/revert-214-master
noelmcloughlin Jul 4, 2019
0253e6e
Use tpldir to make imports work from e.g. salt-ssh without having to …
VBH-Jenkins Jul 5, 2019
9b139aa
fix(sls): avoid unnecessary rendering error
noelmcloughlin Jul 9, 2019
b0ce436
doc(clean): make remove alias for clean
noelmcloughlin Jul 9, 2019
be9a769
fix(merge): workaround broken map.jinja merge
noelmcloughlin Jul 9, 2019
79faa17
Merge branch 'master' into broken_merge
noelmcloughlin Jul 9, 2019
71b46bd
chore(template): align osmap with template-formula
noelmcloughlin Jul 9, 2019
9ed1016
Merge branch 'master' into osfamily
noelmcloughlin Jul 9, 2019
8d61745
feat(macos): docker desktop for mac support
noelmcloughlin Jul 9, 2019
e0cccf4
doc(clean): make remove alias for clean
noelmcloughlin Jul 9, 2019
1ac9968
chore(template): align osmap with template-formula
noelmcloughlin Jul 9, 2019
f60c1c7
feat(macos): docker desktop for mac support
noelmcloughlin Jul 9, 2019
95a1244
Merge pull request #217 from noelmcloughlin/rendering_error
myii Jul 10, 2019
d538679
Merge branch 'master' into desktop-for-mac
noelmcloughlin Jul 11, 2019
5baf6d2
pillar.example registry-mirrors
greut Jul 17, 2019
b4b05c1
Merge pull request #212 from noelmcloughlin/python3
noelmcloughlin Jul 19, 2019
2f2282b
Merge pull request #220 from noelmcloughlin/broken_merge
noelmcloughlin Jul 19, 2019
2b23c4a
Merge pull request #218 from noelmcloughlin/clean
noelmcloughlin Jul 19, 2019
09c9a1f
Merge branch 'master' into osfamily
noelmcloughlin Jul 19, 2019
cb2ba06
Merge pull request #221 from noelmcloughlin/osfamily
noelmcloughlin Jul 19, 2019
732f269
Merge branch 'master' into desktop-for-mac
noelmcloughlin Jul 19, 2019
9a5970f
Merge pull request #222 from noelmcloughlin/desktop-for-mac
noelmcloughlin Jul 19, 2019
194456b
Merge branch 'master' into master
noelmcloughlin Jul 19, 2019
89c07be
Merge pull request #216 from remichristiaan/master
noelmcloughlin Jul 19, 2019
947b062
Merge pull request #223 from greut/patch-1
noelmcloughlin Jul 19, 2019
145967c
fix(install): resolve #224
noelmcloughlin Jul 22, 2019
00353cf
refactor(init): remove duplicated jinja
noelmcloughlin Jul 22, 2019
2bbed5c
Update docker/install.sls
noelmcloughlin Jul 22, 2019
c9b24e1
Merge pull request #227 from noelmcloughlin/dups
noelmcloughlin Jul 22, 2019
3a637c7
Merge pull request #226 from noelmcloughlin/fix
myii Jul 22, 2019
71ee3c4
feat(linux): archlinux support (#229)
noelmcloughlin Aug 17, 2019
ea6be11
feat(semantic-release): implement for this formula
myii Oct 16, 2019
9e8e1e8
fix(compose-ng.sls): fix `salt-lint` errors
myii Oct 16, 2019
62122d2
test(testinfra): remove from the formula
myii Oct 16, 2019
451d76d
test(inspec): add tests for package, config & service
myii Oct 16, 2019
dce112a
fix(pillar.example): ensure `docker.config` is available
myii Oct 16, 2019
222fc6d
docs(readme): move to `docs/` directory and modify accordingly
myii Oct 16, 2019
3eaed1b
ci(travis): update `salt-lint` config for `v0.0.10`
myii Oct 23, 2019
d71e747
Merge pull request #235 from myii/feat/implement-semantic-release
myii Oct 23, 2019
3fa1e4f
chore(release): 0.42.0 [skip ci]
semantic-release-bot Oct 23, 2019
d87e787
ci(kitchen): use `debian-10-master-py3` instead of `develop` [skip ci]
myii Oct 24, 2019
2189efb
ci(kitchen+travis): upgrade matrix after `2019.2.2` release [skip ci]
myii Oct 30, 2019
01ece3d
fix(release.config.js): use full commit hash in commit link [skip ci]
myii Oct 31, 2019
18fa798
perf(travis): improve `salt-lint` invocation [skip ci]
myii Nov 2, 2019
71c5bcb
ci(kitchen): use `develop` image until `master` is ready (`amazonlinu…
myii Nov 3, 2019
fe184e9
ci(travis): use build config validation (beta) [skip ci]
myii Nov 13, 2019
f0a07fc
ci(travis): apply changes from build config validation [skip ci]
myii Nov 16, 2019
340556e
ci(travis): opt-in to `dpl v2` to complete build config validation [s…
myii Nov 20, 2019
ba127a0
ci(travis): run `shellcheck` during lint job [skip ci]
myii Nov 27, 2019
12bf914
ci(travis): quote pathspecs used with `git ls-files` [skip ci]
myii Nov 27, 2019
734d4e3
ci(gemfile): restrict `train` gem version until upstream fix [skip ci]
myii Dec 16, 2019
2590d61
ci(travis): use `major.minor` for `semantic-release` version [skip ci]
myii Dec 22, 2019
cc10d97
feat: support optional container removal before start in upstart/systemd
solarchad Jan 16, 2020
6bf1642
Merge pull request #238 from solarchad/support-rm-container-prestart
myii Jan 22, 2020
15c803d
chore(release): 0.43.0 [skip ci]
semantic-release-bot Jan 22, 2020
80a2a98
fix: avoid setting multiple pre-start stanzas in upstart
solarchad Jan 22, 2020
13c1c20
Merge pull request #239 from solarchad/support-rm-container-prestart-…
myii Jan 22, 2020
27b509e
ci(kitchen): avoid using bootstrap for `master` instances [skip ci]
myii Feb 5, 2020
7de17e2
chore(rubocop): move `LineLength` cop from `Metrics` to `Layout` [ski…
myii Feb 14, 2020
c3c4eb8
chore(gitignore): update from the `template-formula` [skip ci]
myii Feb 14, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updating apt (ubuntu/debian) resulted in the following error:
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.
VBH-Jenkins committed Jul 4, 2019
commit 9193df070dae09cb9e075cbd71b2991b728d7145
3 changes: 2 additions & 1 deletion docker/repo.sls
Original file line number Diff line number Diff line change
@@ -8,7 +8,8 @@
{% set humanname_old = 'Old ' if docker.use_old_repo else '' %}

{%- if grains['os_family']|lower in ('debian',) %}
{% set url = 'https://apt.dockerproject.org/repo ' ~ grains["os"]|lower ~ '-' ~ grains["oscodename"] ~ ' main' if docker.use_old_repo else docker.repo.url_base ~ ' ' ~ docker.repo.version ~ ' stable' %}
{% set url = '[arch=' ~ grains["osarch"] ~ '] https://apt.dockerproject.org/repo ' ~ grains["os"]|lower ~ '-' ~ grains["oscodename"] ~ ' main' if docker.use_old_repo else '[arch=' ~ grains["osarch"] ~ '] ' ~ doc


docker-package-repository:
pkgrepo.{{ repo_state }}: