Colton Myers
|
7918736656
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
salt/client/ssh/ssh_py_shim.py
salt/modules/dracr.py
salt/states/boto_vpc.py
tests/unit/states/file_test.py
|
2015-12-08 14:46:23 -07:00 |
|
Nicolas Delaby
|
cb9cb463b0
|
Provide states for managing docker volumes
|
2015-12-02 17:27:20 +01:00 |
|
Colton Myers
|
28b40de8da
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
salt/client/ssh/__init__.py
salt/client/ssh/ssh_py_shim.py
salt/cloud/clouds/ec2.py
salt/cloud/clouds/vmware.py
salt/grains/philips_hue.py
salt/modules/boto_ec2.py
salt/modules/boto_route53.py
salt/modules/dracr.py
salt/modules/philips_hue.py
salt/proxy/philips_hue.py
salt/states/virtualenv_mod.py
|
2015-11-24 16:07:31 -07:00 |
|
Nicolas Delaby
|
e98d18ba41
|
Expose docker networking as state
|
2015-11-24 13:55:22 +01:00 |
|
Colton Myers
|
a471832fa7
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
salt/cloud/clouds/ec2.py
salt/config/__init__.py
salt/modules/git.py
salt/modules/hosts.py
salt/modules/htpasswd.py
salt/states/boto_secgroup.py
salt/states/htpasswd.py
tests/unit/modules/schedule_test.py
|
2015-10-20 18:13:11 -06:00 |
|
Nicolas Delaby
|
a1d0ba392f
|
fixup! Do not pass any argument to docker.start
|
2015-10-13 20:53:11 +02:00 |
|
Nicolas Delaby
|
65c8762e1f
|
Do not pass any argument to docker.start
docker.create is responsible to manage all of them, since docker API 1.16
|
2015-10-13 19:39:32 +02:00 |
|
Colton Myers
|
69d960f8e6
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
doc/man/salt.7
doc/topics/ssh/index.rst
salt/modules/boto_secgroup.py
salt/modules/dockerng.py
salt/states/archive.py
salt/states/boto_elb.py
salt/states/boto_secgroup.py
tests/unit/modules/schedule_test.py
|
2015-10-07 13:11:48 -06:00 |
|
Nicolas Delaby
|
edf625c8b4
|
Add support of labels parameter for dockerng
|
2015-10-06 13:18:05 +02:00 |
|
Nicolas Delaby
|
fadd9bd43e
|
Add test to check we don't call inspect_image on absent images.
|
2015-09-29 15:53:29 +02:00 |
|
Erik Johnson
|
2d51f3d25b
|
tests/unit/states/dockerng_test.py: remove raw string formatting
|
2015-08-26 23:26:08 -05:00 |
|
Nicolas Delaby
|
48f20b9739
|
Do not call inspect_image if we know the image is not downloaded
|
2015-07-06 14:01:25 +02:00 |
|
Nicolas Delaby
|
82ee2da750
|
Enforce environment values to be strings.
|
2015-05-23 15:52:36 +02:00 |
|
Nicolas Delaby
|
1f68d2d9a9
|
Update test to follow new argument name
|
2015-05-22 18:36:50 +02:00 |
|
Nicolas Delaby
|
8b7ddcbbf7
|
Introduce check_is_running
|
2015-05-22 18:36:26 +02:00 |
|
Nicolas Delaby
|
09d934b1ac
|
Fix pull images
add support for use-case when a pulled new-image is forced but no new images
was downloaded from the registry.
|
2015-05-22 15:51:27 +02:00 |
|
Nicolas Delaby
|
b681f71eb3
|
compare images by ID not by name
Because the name can be no longer be correct if an active tag moved to a different image.
It happens frequently when working against `latest` tag.
|
2015-05-22 14:31:19 +02:00 |
|
Nicolas Delaby
|
5f8f24b655
|
Related to #23975 and apply same logic for ports and port_bindings
|
2015-05-21 09:49:21 +02:00 |
|
Erik Johnson
|
8ad8b527b6
|
Update test to mock dockerng.history
|
2015-05-20 13:54:20 -05:00 |
|
rallytime
|
f45c7bdfca
|
Add boilerplate unit test pieces to new dockerng_test file
Also fixes pylint errors in original PR.
Refs #23851
|
2015-05-18 13:04:14 -06:00 |
|
Nicolas Delaby
|
df48ac2b91
|
volumes path, on create, should be the one inside the container
not from the host
|
2015-05-18 14:30:44 +02:00 |
|