toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,055 Commits 3 Branches 295 Tags
ad6fffc689a5ebe8ecc38fd62b5b94e2c0cd00bb
Commit Graph

11 Commits

Author SHA1 Message Date
Sven Dowideit
3c6aacdcbb Merge pull request #4786 from SvenDowideit/run--lxc-conf-is-lxc-driver-only-atm 
add a note that --lxc-conf is lxc-driver only.
Upstream-commit: 0b2b5a594b6aadaffeab1d6ce823717390111f1e
Component: engine
 2014-03-25 11:21:06 +10:00
Michael Crosby
90b90efe51 Merge pull request #4775 from LK4D4/remove_duplicate_dns_#4714 
Remove duplication of Dns in config merging.
Upstream-commit: 5294bf7e67a67b2f0643c61fb126814d82a1979d
Component: engine
 2014-03-21 17:08:06 -07:00
Sven Dowideit
17b4dbb455 I'm not looking forward to documenting cli arguments that may or may not show depending on what plugins / drviers you choose 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: a8cc6ebb181abf58b12ed6ee037711f0b2f1eff2
Component: engine
 2014-03-20 09:59:54 +10:00
LK4D4
e64feaf637 Remove duplication of Dns in config merging. 
Fixes #4714
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 48cb2f03177732823b4091fd3ddd44b2bef2c58e
Component: engine
 2014-03-19 23:20:30 +04:00
Daniel Norberg
c037f13ab8 configurable dns search domains 
Add a --dns-search parameter and a DnsSearch
configuration field for specifying dns search
domains.

Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)
Upstream-commit: fbfac21ed4de550ce72d993810dc07a2c4877a88
Component: engine
 2014-03-19 10:49:25 -04:00
unclejack
19c6fcaf73 Merge pull request #4653 from creack/fix_expose_cache 
Fix expose cache
Upstream-commit: 28a9ff7f2557d88174b46482a5b402c511684cf7
Component: engine
 2014-03-14 16:09:13 +02:00
Guillaume J. Charmes
c733b13d1a Fix EXPOSE cache miss issue 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: ab26c16b32420011b0aee3de1a3bce5a0afd6f4d
Component: engine
 2014-03-13 13:58:09 -07:00
Tianon Gravi
c48adc6929 Update to double-dash everywhere 
These were found using `git grep -nE '[^-a-zA-Z0-9<>]-[a-zA-Z0-9]{2}'` (fair warning: _many_ false positives there).

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 44fe8cbbd174b5d85d4a063ed270f6b9d2279b70
Component: engine
 2014-03-13 11:46:02 -06:00
Victor Vieux
5bd0f32f99 move opts out of pkg because it's related to docker 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: fde5f573d39020476c08ed25fac0a6306f7b18cc
Component: engine
 2014-03-10 21:10:23 +00:00
Victor Vieux
ead774a13b move a unit test file 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 0ebf5d0ab3a3999a7e2efe619ef194ff3817e3a3
Component: engine
 2014-03-10 20:24:15 +00:00
Solomon Hykes
e378922981 Move the canonical run configuration objects to a sub-package 
* Config is now runconfig.Config
    * HostConfig is now runconfig.HostConfig
    * MergeConfig is now runconfig.Merge
    * CompareConfig is now runconfig.Compare
    * ParseRun is now runconfig.Parse
    * ContainerConfigFromJob is now runconfig.ContainerConfigFromJob
    * ContainerHostConfigFromJob is now runconfig.ContainerHostConfigFromJob

This facilitates refactoring commands.go and shrinks the core.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 6393c38339e11b4a099a460ecf46bb5cafc4283b
Component: engine
 2014-02-11 20:18:46 -08:00