22 Commits

Author	SHA1	Message	Date
Mike Place	9865b07729	Adjust mock for docker test ... cc: @dmacvicar	2016-08-23 21:04:52 +09:00
rallytime	48cc3bdfaa	Merge branch '2016.3' into 'develop' ... Conflicts: - salt/modules/dockerng.py - tests/unit/modules/dockerng_test.py	2016-08-15 13:27:52 -06:00
Nicolas Delaby	49af330492	Docker 1.12 reports tags as null (#35447) ... Add support for this new value.	2016-08-15 10:58:50 -06:00
Mike Place	be42f8857f	Fix docker test ... I think this was originally just a typo	2016-08-03 04:00:33 +09:00
Mike Place	b11fd8ef6a	Merge pull request #34484 from dmacvicar/docker_images ... [WIP] Creating Docker images with pure Salt and running Salt commands inside containers	2016-07-15 16:17:59 -06:00
Justin Anderson	7dd8035c62	Gate docker unit test to check for docker (#34591) ... * Gate docker unit test to check for docker * Change skipIf to check if docker-py is installed, not version check	2016-07-12 13:33:31 -04:00
Duncan Mac-Vicar P	b60f76b836	pylint: W1699(incompatible-py3-code)	2016-07-12 15:44:01 +02:00
Duncan Mac-Vicar P	cfdb1c3928	typo	2016-07-12 14:38:22 +02:00
Duncan Mac-Vicar P	1f77336a1d	test that fix /tmp is not used	2016-07-12 14:37:47 +02:00
Duncan Mac-Vicar P	59d8ce480e	implement keyword arguments for dockerng.call	2016-07-06 14:11:17 +02:00
Duncan Mac-Vicar P	d3ee81c561	testcase for call	2016-07-06 11:49:39 +02:00
Duncan Mac-Vicar P	4e7e72e9c4	test return value	2016-07-06 09:37:14 +02:00
Duncan Mac-Vicar P	8aadb33d44	first version of building docker images	2016-07-06 09:14:49 +02:00
Nicolas Delaby	5d73d54ed2	Enhance dockerng.wait() to control success on exit_code and on already stopped containers (#32475)	2016-04-13 08:16:26 -06:00
Nicolas Delaby	dff6fa1fb2	Add execution module to manage docker volumes	2015-12-02 17:27:20 +01:00
Nicolas Delaby	17ff5c1ab5	Add expose networking to modules.dockerng	2015-11-24 13:55:22 +01:00
Nicolas Delaby	821ed72f37	pass filters argument to dockerng.ps	2015-10-07 15:06:16 +02:00
Nicolas Delaby	edf625c8b4	Add support of labels parameter for dockerng	2015-10-06 13:18:05 +02:00
Nicolas Delaby	b184faa55b	Enforce usage of host_config and require docker-py>=1.4.0	2015-09-28 23:24:57 +02:00
Nicolas Delaby	a1ed6cda56	Skip test if docker-py is not installed	2015-09-28 19:53:10 +02:00
Nicolas Delaby	cc8471bd1b	dockerpy expect only command argument not cmd	2015-09-28 10:08:40 -05:00
Nicolas Delaby	1e8e082f40	Migrate salt.mine to dockerng	2015-06-10 08:59:03 +02:00