Diffusion puppet-puppetlabs-docker 82ce87b7bafc

Merge pull request #1 from puppetlabs/master
82ce87b7bafcUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.
Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

Merge pull request #1 from puppetlabs/master

Update from upstream

Details

Provenance

Kevin Häfeli <khaefeli@users.noreply.github.com>	Authored on Jun 21 2019, 2:40 PM
GitHub <noreply@github.com>	Committed on Jun 21 2019, 2:40 PM
olasd	Pushed on Dec 2 2019, 6:03 PM

Parents

R205:28265e655b1a: Fix #239 local_user permission denied (#497)
R205:8f333f60c092: Allow custom docker_group and service_name values in run.pp (#431)

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

28265e655b1a Fix #239 local_user permission denied (#497)
Author
Demian <thde@users.noreply.github.com>
Browse Repository
No Builds
No Audits
a2135415c587 Merge pull request #496 from thde/patch-1
Author
Florin Dragos <florindragos@users.noreply.github.com>
Browse Repository
No Builds
No Audits
763fd4c27cbb fix typo
Author
Demian <thde@users.noreply.github.com>
Browse Repository
No Builds
No Audits
efd575958446 Merge pull request #493 from eimlav/fm-8151
Author
sheenaajay <sheena@puppet.com>
Browse Repository
No Builds
No Audits
7bf3ea6ebe98 Modify tests to fix permissions issues
Author
Eimhin Laverty <eimhin.laverty@puppet.com>
Browse Repository
No Builds
No Audits
9cac9f5544fa Additional changes to account for incompatible image
Author
Eimhin Laverty <eimhin.laverty@puppet.com>
Browse Repository
No Builds
No Audits
70c1421afa8b (FM-8151) Add Windows Server 2019 support
Author
Eimhin Laverty <eimhin.laverty@puppet.com>
Browse Repository
No Builds
No Audits
6fee44d690d6 Merge pull request #490 from eimlav/modules-9193
Author
sheenaajay <sheena@puppet.com>
Browse Repository
No Builds
No Audits
76f38e87e7fe (MODULES-9193) Revert part of MODULES-9177
Author
Eimhin Laverty <eimhin.laverty@puppet.com>
Browse Repository
No Builds
No Audits
519eb5d49e12 Merge pull request #489 from eimlav/modules-9177
Author
sheenaajay <sheena@puppet.com>
Browse Repository
No Builds
No Audits
b7e0e241bac3 (MODULES-9177) Fix version validation regex
Author
Eimhin Laverty <eimhin.laverty@puppet.com>
Browse Repository
No Builds
No Audits
3bf6b921559f Merge pull request #486 from eimlav/fm-8100
Author
lionce <42546087+lionce@users.noreply.github.com>
Browse Repository
No Builds
No Audits
e25e5e0f87b8 (FM-8100) Update minimum supported Puppet version to 5.5.10
Author
Eimhin Laverty <eimhin.laverty@puppet.com>
Browse Repository
No Builds
No Audits
9575cfde1cac Merge pull request #484 from eimlav/modules-9029
Author
sheenaajay <sheena@puppet.com>
Browse Repository
No Builds
No Audits
afe885cc9f3d (MODULES-9029) Fix Windows acceptance tests
Author
Eimhin Laverty <eimhin.laverty@puppet.com>
Browse Repository
No Builds
No Audits
a2fa90991fbb (MODULES-9029) Fix rubocop offenses
Author
Eimhin Laverty <eimhin.laverty@puppet.com>
Browse Repository
No Builds
No Audits
d4f1cfb73a5f (MODULES-9029) Update pdk template to 46a1deb
Author
Eimhin Laverty <eimhin.laverty@puppet.com>
Browse Repository
No Builds
No Audits
fd094e88d07e Merge pull request #483 from eimlav/modules-9034
Author
sheenaajay <sheena@puppet.com>
Browse Repository
No Builds
No Audits
1808b9528931 (MODULES-9036) Fix Windows acceptance tests
Author
Eimhin Laverty <eimhin.laverty@puppet.com>
Browse Repository
No Builds
No Audits
b95529d7b335 (MODULES-9035) Fix RedHat acceptance tests
Author
Eimhin Laverty <eimhin.laverty@puppet.com>
Browse Repository
No Builds
No Audits
978117902a61 (MODULES-9034) Fix Ubuntu and Debian tests
Author
Eimhin Laverty <eimhin.laverty@puppet.com>
Browse Repository
No Builds
No Audits
d93316cb89cd Merge pull request #480 from benningm/master
Author
carabasdaniel <daniel.carabas@puppet.com>
Browse Repository
No Builds
No Audits
d7473ebfbd83 Update docker volume documentation
Author
Markus Benning <ich@markusbenning.de>
Browse Repository
No Builds
No Audits
a77179b52f28 Merge pull request #376 from iamjamestl/run-systemd
Author
carabasdaniel <daniel.carabas@puppet.com>
Browse Repository
No Builds
No Audits
2a0f381e01aa Add missing single quote (#478)
Author
David Schmitt <david.schmitt@puppet.com>
Browse Repository
No Builds
No Audits
4b57d04dc543 Add service_provider parameter to docker::run
Author
James T. Lee <james@james.tl>
Browse Repository
No Builds
No Audits
813dcbdb1aa7 Merge pull request #468 from electrofelix/noop-latest-images
Author
carabasdaniel <daniel.carabas@puppet.com>
Browse Repository
No Builds
No Audits
9b6ea2b31ebc Merge pull request #475 from florindragos/master
Author
TP Honey <tphoney@users.noreply.github.com>
Browse Repository
No Builds
No Audits
c36e36b74dbb Fix supported operating systems in the readme
Author
Florin Dragos <florindragos@users.noreply.github.com>
Browse Repository
No Builds
No Audits
1cbcf1e991b7 Merge pull request #470 from florindragos/master
Author
TP Honey <tphoney@users.noreply.github.com>
Browse Repository
No Builds
No Audits
f9e4c88250ba Add missing apostrophe in array. (#473)
Author
Tobias Wolter <mumpfpuffel@gmail.com>
Browse Repository
No Builds
No Audits
0506ec8bd7de Fix container running check to work for windows hosts
Author
Florin Dragos <florin@puppet.com>
Browse Repository
No Builds
No Audits
e9f906cb7cbd Fix publish flag being erroneously added to docker service commands (#471)
Author
Seth Hayward <37913900+twistedduck@users.noreply.github.com>
Browse Repository
No Builds
No Audits
043395e267e4 Introduced docker machine support (#466)
Author
acurus-puppetmaster <puppetmaster@acurus.com.au>
Browse Repository
No Builds
No Audits
d4dac109b72c Fix docker::image to not run images (#465)
Author
hugotanure <hugotanure@gmail.com>
Browse Repository
No Builds
No Audits
e01a33fbfded Allow images tagged latest to update on each run
Author
Darragh Bailey <dbailey@hpe.com>
Browse Repository
No Builds
No Audits
ddd99ac4439e Update readme for aws logging options (#459)
Author
acurus-puppetmaster <puppetmaster@acurus.com.au>
Browse Repository
No Builds
No Audits
e59ec60b6ff6 release 3.5.0 (#458)
Author
davejrt <2067825+davejrt@users.noreply.github.com>
Browse Repository
No Builds
No Audits
84e8edc3f660 fix(syntax): Remove duplicate parenthesis (#454)
Author
Jean-François Roche <jfroche@affinitic.be>
Browse Repository
No Builds
No Audits
c8b59023dacf adding in capability to attach multiple networks to container (#451)
Author
davejrt <2067825+davejrt@users.noreply.github.com>
Browse Repository
No Builds
No Audits
1352bb63d676 making dependency ranges more logical (#453)
Author
davejrt <2067825+davejrt@users.noreply.github.com>
Browse Repository
No Builds
No Audits
fb2d756fcb58 Docker::Services:: fix command parameter used with an array (#452)
Author
Jack <jackdev@mailbox.org>
Browse Repository
No Builds
No Audits
15ee0e43a8ee Docker::Services: Add networks parameter for swarm services (#450)
Author
Jack <jackdev@mailbox.org>
Browse Repository
No Builds
No Audits
226be6c1a2b6 Add ability to set service_after_override to false (#448)
Author
esalberg <esalberg@users.noreply.github.com>
Browse Repository
No Builds
No Audits
059d8a803535 Add ability to override After for docker.service (#446)
Author
esalberg <esalberg@users.noreply.github.com>
Browse Repository
No Builds
No Audits
a2046798977c docker::services: Fix using multiple published ports (#447)
Author
Jack <jackdev@mailbox.org>
Browse Repository
No Builds
No Audits
01932d745a9d release for v3.4.0 (#442)
Author
davejrt <2067825+davejrt@users.noreply.github.com>
Browse Repository
No Builds
No Audits
16764c381e94 adding in documentation for use of stack type/provider (#443)
Author
davejrt <2067825+davejrt@users.noreply.github.com>
Browse Repository
No Builds
No Audits
4ba9cfe8398b changing permissions to remove systemd warning (#440)
Author
davejrt <2067825+davejrt@users.noreply.github.com>
Browse Repository
No Builds
No Audits
1cc42964bb98 Add docker socket group overrides for systemd (service and socket) (#441)
Author
esalberg <esalberg@users.noreply.github.com>
Browse Repository
No Builds
No Audits

Changes (80)

Path

Size

lib/

facter/

docker.rb

puppet/

parser/

functions/

docker_run_flags.rb

docker_service_flags.rb

provider/

docker_stack/

type/

manifests/

spec/

acceptance/

compose_v3_spec.rb

docker_custom_source_spec.rb

acceptance_swarm/

classes/

compose_windows_spec.rb

docker_spec.rb

docker_windows_spec.rb

machine_spec.rb

system_reload_spec.rb

defines/

exec_spec.rb

exec_windows_spec.rb

image_spec.rb

image_windows_spec.rb

spec_helper_acceptance.rb

unit/

docker_compose_spec.rb

docker_facts_spec.rb

docker_network_spec.rb

docker_volume_spec.rb

docker_network_spec.rb

type

docker_network_spec.rb

docker_stack_spec.rb

	lib/

	facter/

	docker_spec.rb
	docker_facts_spec.rb

	puppet/	type/

docker_compose_spec.rb

docker_volume_spec.rb

tasks/

swarm_token.rb

templates/

docker-run-start.erb

etc/

systemd/

system/

docker.service.d/

service-overrides-debian.conf.erb

service-overrides-rhel.conf.erb

docker.socket.d

socket-overrides.conf.erb

windows/

	download_docker_machine.ps1.erb
	download_docker_compose.ps1.erb

R205:82ce87b7bafc

View Options

.gitignore

View Options

.pdkignore

View Options

.puppet-lint.rc

View Options

.rubocop.yml

View Options

.sync.yml

View Options

.travis.yml

View Options

CHANGELOG.md

View Options

Gemfile

View Options

README.md

View Options

Rakefile

View Options

lib/facter/docker.rb

View Options

lib/puppet/parser/functions/docker_run_flags.rb

View Options

lib/puppet/parser/functions/docker_service_flags.rb

View Options

lib/puppet/provider/docker_stack/ruby.rb

View Options

lib/puppet/type/docker_stack.rb

View Options

manifests/image.pp

View Options

manifests/init.pp

View Options

manifests/install.pp

View Options

manifests/machine.pp

View Options

manifests/params.pp

View Options

manifests/plugin.pp

View Options

manifests/registry.pp

View Options

manifests/run.pp

View Options

manifests/service.pp

View Options

manifests/services.pp

View Options

manifests/stack.pp

View Options

metadata.json

View Options

spec/acceptance/compose_v3_spec.rb

View Options

spec/acceptance/docker_custom_source_spec.rb

View Options

spec/acceptance/docker_full_spec.rb

View Options

spec/acceptance/docker_spec.rb

View Options

spec/acceptance/network_spec.rb

View Options

spec/acceptance/plugin_spec.rb

View Options

spec/acceptance/stack_spec.rb

View Options

spec/acceptance/volume_spec.rb

View Options

spec/acceptance_swarm/swarm_spec.rb

View Options

spec/classes/compose_spec.rb

View Options

spec/classes/compose_windows_spec.rb

View Options

spec/classes/docker_spec.rb

View Options

spec/classes/docker_windows_spec.rb

View Options

spec/classes/machine_spec.rb

View Options

spec/classes/system_reload_spec.rb

View Options

spec/defines/exec_spec.rb

View Options

spec/defines/exec_windows_spec.rb

View Options

spec/defines/image_spec.rb

View Options

spec/defines/image_windows_spec.rb

View Options

spec/defines/plugin_spec.rb

View Options

spec/defines/registry_spec.rb

View Options

spec/defines/run_spec.rb

View Options

spec/defines/run_windows_spec.rb

View Options

spec/defines/secrets_spec.rb

View Options

spec/defines/services_spec.rb

View Options

spec/defines/stack_spec.rb

View Options

spec/defines/swarm_spec.rb

View Options

spec/defines/system_user_spec.rb

View Options

spec/spec_helper.rb

View Options

spec/spec_helper_acceptance.rb

View Options

spec/unit/docker_compose_spec.rb

View Options

spec/unit/docker_facts_spec.rb

View Options

spec/unit/docker_network_spec.rb

View Options

spec/unit/docker_volume_spec.rb

View Options

spec/unit/lib/facter/docker_spec.rb

View Options

spec/unit/lib/puppet/provider/docker_network_spec.rb

View Options

spec/unit/lib/puppet/type/docker_compose_spec.rb

View Options

spec/unit/lib/puppet/type/docker_network_spec.rb

View Options

spec/unit/lib/puppet/type/docker_stack_spec.rb

View Options

spec/unit/lib/puppet/type/docker_volume_spec.rb

View Options

tasks/swarm_token.rb

View Options

templates/docker-run-start.erb

View Options

templates/etc/systemd/system/docker.service.d/service-overrides-debian.conf.erb

View Options

templates/etc/systemd/system/docker.service.d/service-overrides-rhel.conf.erb

View Options

templates/etc/systemd/system/docker.socket.d/socket-overrides.conf.erb

View Options

templates/windows/download_docker_machine.ps1.erb

Merge pull request #1 from puppetlabs/master82ce87b7bafcUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (80)

R205:82ce87b7bafc

.gitignore

.pdkignore

.puppet-lint.rc

.rubocop.yml

.sync.yml

.travis.yml

CHANGELOG.md

Gemfile

README.md

Rakefile

lib/facter/docker.rb

lib/puppet/parser/functions/docker_run_flags.rb

lib/puppet/parser/functions/docker_service_flags.rb

lib/puppet/provider/docker_stack/ruby.rb

lib/puppet/type/docker_stack.rb

manifests/image.pp

manifests/init.pp

manifests/install.pp

manifests/machine.pp

manifests/params.pp

manifests/plugin.pp

manifests/registry.pp

manifests/run.pp

manifests/service.pp

manifests/services.pp

manifests/stack.pp

metadata.json

spec/acceptance/compose_v3_spec.rb

spec/acceptance/docker_custom_source_spec.rb

spec/acceptance/docker_full_spec.rb

spec/acceptance/docker_spec.rb

spec/acceptance/network_spec.rb

spec/acceptance/plugin_spec.rb

spec/acceptance/stack_spec.rb

spec/acceptance/volume_spec.rb

spec/acceptance_swarm/swarm_spec.rb

spec/classes/compose_spec.rb

spec/classes/compose_windows_spec.rb

spec/classes/docker_spec.rb

spec/classes/docker_windows_spec.rb

spec/classes/machine_spec.rb

spec/classes/system_reload_spec.rb

spec/defines/exec_spec.rb

spec/defines/exec_windows_spec.rb

spec/defines/image_spec.rb

spec/defines/image_windows_spec.rb

spec/defines/plugin_spec.rb

spec/defines/registry_spec.rb

spec/defines/run_spec.rb

spec/defines/run_windows_spec.rb

spec/defines/secrets_spec.rb

spec/defines/services_spec.rb

spec/defines/stack_spec.rb

spec/defines/swarm_spec.rb

spec/defines/system_user_spec.rb

spec/spec_helper.rb

spec/spec_helper_acceptance.rb

spec/unit/docker_compose_spec.rb

spec/unit/docker_facts_spec.rb

spec/unit/docker_network_spec.rb

spec/unit/docker_volume_spec.rb

spec/unit/lib/facter/docker_spec.rb

spec/unit/lib/puppet/provider/docker_network_spec.rb

spec/unit/lib/puppet/type/docker_compose_spec.rb

spec/unit/lib/puppet/type/docker_network_spec.rb

spec/unit/lib/puppet/type/docker_stack_spec.rb

spec/unit/lib/puppet/type/docker_volume_spec.rb

tasks/swarm_token.rb

templates/docker-run-start.erb

templates/etc/systemd/system/docker.service.d/service-overrides-debian.conf.erb

templates/etc/systemd/system/docker.service.d/service-overrides-rhel.conf.erb

templates/etc/systemd/system/docker.socket.d/socket-overrides.conf.erb

Merge pull request #1 from puppetlabs/master
82ce87b7bafcUnpublished
Actions