p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
9,206 Commits 2 Branches 295 Tags
bc68396213e78e924eb7ba852a6d94de4ca4f50a
Commit Graph

55 Commits

Author SHA1 Message Date
unclejack
e523e1e304 correct typo - desination -> destination 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: a1b6f350e806c43225b724530e563d6ff66e6b8a
Component: engine
 2014-06-27 19:49:40 +03:00
Michael Crosby
cb56a2df49 Allow / as source of -v 
We discussed this at the docker plumbers meetup and for tools and
working on the system for things like boot2docker and coreos this is
needed.  You can already bypass this check so we felt it is ok to start
allowing this feature.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: e39b8eade1f42503b6b7217e72eff4c8fdc13cb6
Component: engine
 2014-06-26 10:50:18 -07:00
unclejack
0e66ad87bd fix TestParseRunVolumes with Go 1.3 randomization 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: f6e6cf9071b098f3e38b42597d94cd0768b17219
Component: engine
 2014-06-26 01:48:58 +03:00
Kato Kazuyoshi
0759f90ae4 Fatal() doesn't take a format string like Fatalf() 
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
Upstream-commit: 00469957ad0e17adf60a486740f4132a503e7309
Component: engine
 2014-06-21 17:32:39 +09:00
Kevin "qwazerty" Houdebert
f3557341d8 Fix minor typo 
Docker-DCO-1.1-Signed-off-by: Kevin Houdebert kevin.houdebert@gmail.com (github: qwazerty)
Upstream-commit: d7e5fdfb58d5829344486b7a6171f7e866f0378b
Component: engine
 2014-06-19 14:49:52 +02:00
Timothy
4c39400bd1 Document the potential insecurity of --net host 
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)
Upstream-commit: ed5054389aa7cd0456bfdf1d940d3cdad0313f8f
Component: engine
 2014-06-16 20:40:07 +00:00
Victor Vieux
1a7abd252b add tests 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 6cb16f1c316c55e3b6108d178ffcde2e705cbe47
Component: engine
 2014-06-11 21:15:48 +00:00
Victor Vieux
62d142653c Allow --net=none & -h 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: f411f8bfc5d04aed6499dfc90e357c58713bc84d
Component: engine
 2014-06-11 21:07:50 +00:00
Michael Crosby
aad71a085e Update runconfig unit test for changes 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: e2d79bec3ab76357625ca57d83299012f584c024
Component: engine
 2014-05-20 21:11:33 +00:00
Michael Crosby
2c620b9486 Don't save bind mounts in image 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d535d9810012b18ca83f86aa416ff4a08bb49804
Component: engine
 2014-05-19 22:18:37 +00:00
Michael Crosby
09f949815a Move init volumes code to func 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: e454be7567e144dc836ff283d4f4e059db307a91
Component: engine
 2014-05-19 22:04:51 +00:00
Victor Vieux
8003cf19d2 do not merge -i or -t options 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 2c8b63cb754128a64083426e5c3e6016118e78df
Component: engine
 2014-05-16 22:31:16 +00:00
Victor Vieux
94d0641f06 Merge pull request #5756 from crosbymichael/move-units-to-pkg 
Move duration and size to units pkg
Upstream-commit: bc22c9948c5380715338aef63fcc6cccd1a16bd7
Component: engine
 2014-05-14 11:36:14 -07:00
Michael Crosby
4926e35bb1 Add cpuset cpus support for docker 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: adbe3096e8c8572925dbae5f19ac2ce2dc84fb1c
Component: engine
 2014-05-13 18:17:12 -07:00
Michael Crosby
d39f282a2b Move duration and size to units pkg 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d33b4655c4339dcbbf9f78948598e216ac3c06b4
Component: engine
 2014-05-12 17:05:07 -07:00
Victor Vieux
fb89461e49 returns an error when using -h and --net 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 2899195540857f2ad7c50ea509847c3a598c5e81
Component: engine
 2014-05-09 21:42:22 +00:00
Lars R. Damerow
35bec1ebab Fix error name typo (ErrInvalidWorikingDirectory) 
Docker-DCO-1.1-Signed-off-by: Lars R. Damerow <lars@grandstreet.us> (github: bitness)
Upstream-commit: d3150e0927043976b0b88bd61e50dc1e456fa77b
Component: engine
 2014-05-07 16:28:51 -07:00
Victor Vieux
fdccd2aaa1 improve some usages 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: b622da3cfe211d31df69e72a93ed4fae872aca65
Component: engine
 2014-05-06 21:32:12 +00:00
Sven Dowideit
65cf6af87c Update the run --net cli help to include the 'host' option 
and then add that to the run and cli docs

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 9eeff6d099a951c3a3e45d63ce2f8cb158aaeb6c
Component: engine
 2014-05-06 20:26:44 +10:00
Michael Crosby
1cb3e810da Address code review feedback 
Also make sure we copy the joining containers hosts and resolv.conf with
the hostname if we are joining it's network stack.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 0b187b909be1dac60194250bc6e9ff292a0bd5c9
Component: engine
 2014-05-05 10:08:59 -07:00
Michael Crosby
5fdf7d4579 Update host networking with hostname and files 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 5ca6532011436eee85ccb555a0832a82450454ea
Component: engine
 2014-05-05 10:08:59 -07:00
Michael Crosby
0fcf738183 Setup host networking for lxc and native 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: a785882b29b9f0b24ace8249576c5d8d7f8c1d94
Component: engine
 2014-05-05 10:08:59 -07:00
Michael Crosby
ad111d4199 Update --net flags and container mode 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 2c2cc051d831f54d1bb070642edcd876ff669e78
Component: engine
 2014-05-05 10:08:59 -07:00
Johan Euphrosine
bb0461e564 runconfig/parse: add test for parseNetMode 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 7118416aeeb779373685d192c26a329e9acdef89
Component: engine
 2014-05-05 10:08:59 -07:00
Johan Euphrosine
381004dc30 runconfig: add -net container:name option 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: a60159f3b102244fc5470642bd32eb99d5ac329c
Component: engine
 2014-05-05 10:08:59 -07:00
Michael Crosby
7de0d1325f Make volumes-from a slice instead of string split 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: b4f2821e6d4ba6f6073365a244681df21f5d4472
Component: engine
 2014-04-08 21:45:06 +00:00
Michael Crosby
ecfa4893ce Move volumesfrom to hostconfig 
This also migrates the volumes from integration tests into the new cli
integration test framework.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: af9746412b6070063f105ae97eba1f8fbd56bd22
Component: engine
 2014-04-08 21:45:06 +00:00
Michael Crosby
7f3a663aad Move DNS options to hostconfig 
The local resolver warning needed to be moved at daemon start because it
was only show for the first container started anyways before having a
default value set.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 919dbbe44df0722ca35538223a9c89e71856ec88
Component: engine
 2014-04-07 19:12:22 -07:00
Michael Crosby
84a11b7762 Move -o cli flag and DriverConfig from HostConfig 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: ffebcb660f666e3a2a7be6b838ebd55f524d5b5d
Component: engine
 2014-04-07 14:44:52 -07:00
Michael Crosby
91572b0294 Remove runtime options from config 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: e2779e11db113c5551094dba8079d44d8a210e41
Component: engine
 2014-04-03 04:40:38 +00:00
Guillaume J. Charmes
b924033920 Merge pull request #4833 from crosbymichael/pluginflag 
Add opts flag for fine grained control over drivers
Upstream-commit: b4b87413d8d3fd20073975bcc84603fa7853d316
Component: engine
 2014-04-01 13:34:08 -07:00
Michael Crosby
3edb80395b Ensure secound part of the key is provided 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 7a7f59210d5eb7a38a5fac8889010bd54576ea01
Component: engine
 2014-03-31 23:12:08 +00:00
Vincent Batts
b8d8d2a7df env-file: remove the unneeded deprecation markup 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: d9c257732e435cecdcc1ec8452f35e7614e4713f
Component: engine
 2014-03-31 14:45:13 -04:00
Vincent Batts
745a00084d env-file: update functionality and docs 
Multiple flags allowed. Order prescribed. Examples provided. Multiline
accounted for.

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 33dde1f7288781a3a36951309f963e6040a1a0f5
Component: engine
 2014-03-31 14:45:13 -04:00
Vincent Batts
a229ff052a make the --env-file accept multiple flags 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: acf5289dddfbbd69e19714f53575eb5088c618f7
Component: engine
 2014-03-31 14:45:13 -04:00
Vincent Batts
d6e8571af8 --env-file instead of --envfile 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 586e6c5eb9cd21a95d4bbba051249c4b05b2011e
Component: engine
 2014-03-31 14:44:32 -04:00
Vincent Batts
2d9f166bda support for docker run environment variables file 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: cd51ac92bdf1ce0a1245f5b4565995631512ba64
Component: engine
 2014-03-31 14:44:32 -04:00
Alexander Larsson
9e1caa6b4a Add --opt arguments for drivers 
In order to handle special configuration for different drivers we
make the Config field a map to string array. This lets
us use it for lxc, by using the "lxc" key for those, and we can
later extend it easily for other backend-specific options.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 7a3070a6000963d12be9dcd2698d911b848a33b6
Component: engine
 2014-03-27 21:47:47 +01:00
Michael Crosby
5ed6e1adb8 Fix compile and unit test errors after merge 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 2d270c4f06dbc2ee1293e3f81f6922df248ef8eb
Component: engine
 2014-03-27 08:25:01 +00:00
Michael Crosby
f4111a1ccb Merge branch 'master' into pluginflag 
Conflicts:
	pkg/cgroups/cgroups.go
	pkg/libcontainer/nsinit/exec.go
	pkg/libcontainer/nsinit/init.go
	pkg/libcontainer/nsinit/mount.go
	runconfig/hostconfig.go
	runconfig/parse.go
	runtime/execdriver/driver.go
	runtime/execdriver/lxc/lxc_template.go
	runtime/execdriver/lxc/lxc_template_unit_test.go
	runtime/execdriver/native/default_template.go
	runtime/execdriver/native/driver.go

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: eab56ac007b263708b5526609c8be2bc19881467
Component: engine
 2014-03-27 08:00:18 +00:00
Dan Walsh
f757666ccd This patch adds SELinux labeling support. 
docker will run the process(es) within the container with an SELinux label and will label
all of  the content within the container with mount label.  Any temporary file systems
created within the container need to be mounted with the same mount label.

The user can override the process label by specifying

-Z With a string of space separated options.

-Z "user=unconfined_u role=unconfined_r type=unconfined_t level=s0"

Would cause the process label to run with unconfined_u:unconfined_r:unconfined_t:s0"

By default the processes will run execute within the container as svirt_lxc_net_t.
All of the content in the container as svirt_sandbox_file_t.

The process mcs level is based of the PID of the docker process that is creating the container.

If you run the container in --priv mode, the labeling will be disabled.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 4c4356692580afb3971094e322aea64abe0e2500
Component: engine
 2014-03-26 15:30:40 -04:00
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
Michael Crosby
74929e5ece Change syntax to use dots 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 146a212f71fe129f9d349c5c3e80ba4197e35850
Component: engine
 2014-03-21 12:38:50 +00:00
Michael Crosby
e56e4f3bca Change flag to -o and --opt 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: c9d7f858fd1c6e2d1287e28ee12952333b327c75
Component: engine
 2014-03-21 11:53:15 +00:00
Michael Crosby
40c5419c0f Add initial plugin flag to pass lxc and native driver options 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f7b3e879fc3047ed93ac6b43cd9bf47a25f3d0fc
Component: engine
 2014-03-20 22:58:02 +00: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