toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,282 Commits 3 Branches 295 Tags
767f006e91c8ab16b9db69e196510784a45a7643
Commit Graph
185 Commits
Author SHA1 Message Date
David Calavera 15774a14e5 Merge pull request #13218 from brahmaroutu/decoder_issue_gccgo 
Decoder does not work properly with nested pointers using gcc
Upstream-commit: b1143f4cb097461760ccde1499069c806f8f94af
Component: engine
 2015-06-18 13:22:28 -07:00
Sebastiaan van Stijn f29d02bba3 Merge pull request #13502 from coolljt0725/conflict_port_and_netmode 
Add --net=container with --publish --expose --publish-all error out
Upstream-commit: 637023a5f8d8347a0e271c09d5c9bc84fbc97693
Component: engine
 2015-06-15 16:25:59 +02:00
Srini Brahmaroutu 109d836db0 Decoder does not work properly with nested pointers using gcc 
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: eb97de7dee5f36e6b6a710a0def245c11cb4cba5
Component: engine
 2015-06-11 16:45:54 +00:00
Antonio Murdaca 6aab6b5654 Avoid nil pointer dereference while creating a container with an empty Config 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 4ce817796e639391f6bc3e338f5a88985daacaca
Component: engine
 2015-06-06 20:07:32 +02:00
Arnaud Porterie 4dfff4ae36 Container don't inherit from image labels 
Labels are metadata that apply to a particular resource: image,
container, maybe volumes and networks in the future. We shouldn't have
containers inherit from its image labels: they are not the same obejcts,
and labels cannot be interpreted in the way.

It remains possible to apply metadata to an image using the LABEL
Dockerfile instruction, to query them using `docker inspect <img>`, or
to filter images on them using `docker images --filter <key>=<value>`.

Fixes #13770.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 79621c7728ab83292ffd94d005f10ccebfba055b
Component: engine
 2015-06-05 11:11:22 -07:00
Antonio Murdaca 6226136075 Remove PortSpecs from Config 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 15134a3320fbacee36e86a0342e7ffb49285f297
Component: engine
 2015-05-29 22:38:09 +02:00
Dan Walsh 1adf295b9a Modify volume mounts SELinux labels on the fly based on :Z or :z 
This patch is extending the qualifiers on the -v command to allow
an admin to tell the system to relabel, content. There might be a
need for something similar for changing the DAC Permissions.

Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 160dc79db095767de74deb75b8e1ae86f213593c
Component: engine
 2015-05-27 12:50:16 -07:00
Lei Jitang d1589d564f Add --net=container with --publish --publish-all --expose error out 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 13f2aa70687e21159eb8ef13eb5dddb785f0e1ee
Component: engine
 2015-05-27 15:31:06 +08:00
Jessica Frazelle d89704cf56 Revert "Add docker exec run a command in privileged mode" 
This reverts commit 72a500e9e5929b038816d8bd18d462a19e571c99.

Signed-off-by: Jessica Frazelle <princess@docker.com>

Conflicts:
	daemon/execdriver/native/exec.go
	integration-cli/docker_cli_exec_test.go
	runconfig/exec.go
Upstream-commit: 40b71adee390e9c06471b89ed845132b4ec80177
Component: engine
 2015-05-26 14:12:16 -07:00
Arnaud Porterie e89556546b Mark --volume-driver as experimental 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 4fc37a1ede58153bfa6aa5c9aa0f2903f18d572f
Component: engine
 2015-05-21 20:34:17 -07:00
David Calavera 89782c55eb Volumes refactor and external plugin implementation. 
Signed by all authors:

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Jeff Lindsay <progrium@gmail.com>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Signed-off-by: Luke Marsden <luke@clusterhq.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 81fa9feb0cdc0773eff99d7393c16271e84aac08
Component: engine
 2015-05-21 20:34:17 -07:00
Jana Radhakrishnan 13426de5e6 Docker integration with libnetwork 
- Updated Dockerfile to satisfy libnetwork GOPATH requirements.
    - Reworked daemon to allocate network resources using libnetwork.
    - Reworked remove link code to also update network resources in libnetwork.
    - Adjusted the exec driver command population to reflect libnetwork design.
    - Adjusted the exec driver create command steps.
    - Updated a few test cases to reflect the change in design.
    - Removed the dns setup code from docker as resolv.conf is entirely managed
      in libnetwork.
    - Integrated with lxc exec driver.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: d18919e304c240df84502cdcc5ed655d92d12d4f
Component: engine
 2015-05-19 22:40:19 +00:00
Antonio Murdaca 0dbe0e42c5 Add RestartPolicy methods instead of using strings checking 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 624bf81fdb980638c422d746bfb82623e9d8bbd1
Component: engine
 2015-05-16 14:15:28 +02:00
Sebastiaan van Stijn ab675e423e Merge pull request #12667 from ibuildthecloud/host-uts 
Add --uts=host to allow sharing the UTS namespace
Upstream-commit: ed257420025772acc38c51b0f018de3ee5564d0f
Component: engine
 2015-05-13 18:30:32 -07:00
Darren Shepherd dc9bbf77b5 Add --uts=host to allow sharing the UTS namespace 
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: f2e5207fc989288ad136d48222df8e7754eb0e9b
Component: engine
 2015-05-13 17:56:32 -07:00
Lei Jitang 4627e314ec Minor typo: remove redundant dot in error message in runconfig/parse.go 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: c6dad07b1bc585f98439dd87deadec062188cbb5
Component: engine
 2015-05-13 11:04:07 +08:00
Jessie Frazelle 84543fc3ec Merge pull request #13074 from runcom/11824-short-link-if-equals-alias 
Allow links to be specified with only the name if it matches the alias
Upstream-commit: 8cc93856e37f045060cce5345e28421514ba7833
Component: engine
 2015-05-11 13:18:29 -07:00
Antonio Murdaca 60d5f903de Allow links to be specified with only the name if this matches the alias 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: c6e6223ed735b4ff6a15f5d5716376d765f60b09
Component: engine
 2015-05-11 21:50:47 +02:00
Ma Shimiao 560ba9b809 add cpu.cfs_period_us support 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: dccb8b5c339e218222bae4ce74bbeccb9e020c82
Component: engine
 2015-05-09 10:02:46 +08:00
wlan0 0a78638a6e Add log opts flag to pass in logging options 
Signed-off-by: wlan0 <sidharthamn@gmail.com>
Upstream-commit: dca9e02b15a3757272c90ec4cf0cc2b052a25fe3
Component: engine
 2015-05-04 14:39:48 -07:00
Jessie Frazelle 92cec4b2c1 Merge pull request #11516 from coolljt0725/add_show_error_set_some_flag_in_container_netmode 
add support --net=container with --mac-address, --add-host error out
Upstream-commit: 6b6a26c7697978bf7d43fec11d14ef6ee7e3e4d6
Component: engine
 2015-05-07 17:13:32 -07:00
Qiang Huang 4f3515319b add blkio.weight support 
We can use this to control block IO weight of a container.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: f133f11a7d25e6262558dd733afaa95ddd1c7aee
Component: engine
 2015-05-07 11:55:58 +08:00
Doug Davis 309bf49758 Fix RUN's error msg when it fails 
When RUN returns with a non-zero return code it prints the command
that was executed as a Go []string:
```
INFO[0000] The command &{[/bin/sh -c noop a1 a2]} returned a non-zero code: 127
```

instead it should look like this:
```
INFO[0000] The command "/bin/sh -c noop a1 a2" returned a non-zero code: 127
```

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 54662eae10923a0aca03ffddc1a30b7d25431c79
Component: engine
 2015-05-05 16:08:41 -07:00
Lei Jitang 49e7e90010 Add support --net=container with --mac-address,--add-host error out 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 0e08e9aca14a4ca7142fa4649983302d93b55dab
Component: engine
 2015-05-05 19:28:40 +08:00
Lei Jitang a7bae83bd7 Refactor the code of checking conflict option with netmode. 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 101f982059589cac0c8891832ac3f8069291d63a
Component: engine
 2015-05-05 19:23:18 +08:00
HuKeping ad3d66108b Feature: option for disable OOM killer 
Add cgroup support for disable OOM killer.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: a4a924e1b6c50f0f02460489259d73468a6c282e
Component: engine
 2015-05-04 21:11:29 +08:00
John Howard 045d2db914 Windows: Move workdir check daemon-side 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 03eb0d065db006ac1df1bca62436a844674f4d2b
Component: engine
 2015-04-30 14:16:45 -07:00
David Mackey ae74d9f34f trivial: typo cleanup 
Signed-off-by: David Mackey <tdmackey@booleanhaiku.com>
Upstream-commit: 3941623fbc3fa724d61f53121513ffd87d03b61c
Component: engine
 2015-04-27 13:35:08 -07:00
Darren Shepherd 6cf508507e Expose ParseRestartPolicy 
ParseRestartPolicy is useful function for third party go programs to use
so that they can parse the restart policy in the same way that Docker
does

Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: 366ee6bdfa9d2c87d006a162fc951ecc0f68051a
Component: engine
 2015-04-24 12:23:54 -07:00
jianbosun f089bf1e0a remove execCreate & execStart from job 
Also removed the function ExecConfigFromJob

Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 24425021d26f29a475702064181e6c99fb6bd1c5
Component: engine
 2015-04-22 13:51:57 -07:00
Lei Jitang f8f4bcdb38 Add support cpu cfs quota 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: dcc50e1d593fd7995189872791c6d7a013f16970
Component: engine
 2015-04-20 08:16:47 -07:00
Brian Goff 884bdce09a Merge pull request #12253 from calavera/remove_job_from_start_and_create 
Remove engine.Job from Start and Create
Upstream-commit: de923f59b3860eba2c87e8a533b385ac5752243b
Component: engine
 2015-04-15 21:49:25 -04:00
David Calavera 234898b4e7 Decode container configurations into typed structures. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 767df67e3149b83255db0809f6543b449a4f652e
Component: engine
 2015-04-15 10:22:07 -07:00
Qiang Huang 4f6ebaa34e add support for cpuset.mems 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 8077b2fb805c78cee642d8350df88227c6414960
Component: engine
 2015-04-15 09:33:46 +08:00
David Calavera fa70da1003 Remove engine.Job from Create action. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 98996a432e079d1434182ea1cf84e70c927da4c2
Component: engine
 2015-04-14 15:33:12 -07:00
David Calavera c44394bb9b Remove engine.Job from Start action. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 610c436e07388f4898020432b25939cc7104b894
Component: engine
 2015-04-14 15:33:12 -07:00
Antonio Murdaca a4111cba55 Refactor utils/utils, fixes #11923 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: c30a55f14dbbe3971ba0ac716ba69a60868f4490
Component: engine
 2015-04-14 01:37:36 +02:00
Lei Jitang aaaa676179 Add docker exec run a command in privileged mode 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 72a500e9e5929b038816d8bd18d462a19e571c99
Component: engine
 2015-04-11 11:26:37 +08:00
Lei Jitang d1f2626097 Add -u|--user flag to docker exec for running command as a different user 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 2cce4791b0e75201cb65daad07d4203d1c4c2996
Component: engine
 2015-04-11 11:04:24 +08:00
Arnaud Porterie cffe4fa24a Merge pull request #11686 from willhf/9340_test 
Add test for net=container and links
Upstream-commit: 8a50746b5d7783b734c6096b4e2ef444e901397e
Component: engine
 2015-04-06 13:21:01 -07:00
willhf 064a2244e0 Fix incompatible flags conditional 
Signed-off-by: willhf <willhf@gmail.com>
Upstream-commit: bc0cdc0a4c1c83abcf1d8500e8a39f67183963ae
Component: engine
 2015-04-05 19:38:31 -07:00
Antonio Murdaca 0f80e9e5da Refactor utils/flags.go, fixes #11892 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 5670c6c6954e08575a6c821137a7ea6d9084af93
Component: engine
 2015-03-29 03:22:46 +02:00
Antonio Murdaca e5b36a723c Replace aliased imports of logrus, fixes #11762 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 6f4d847046cb4e072de61d042c0266190d73a8c9
Component: engine
 2015-03-26 23:22:04 +01:00
Arnaud Porterie 5e9f154fc1 Remove unused runconfig.Config.SecurityOpt field 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: e39646d2e1becb652ff0a8a7d131067f38a94247
Component: engine
 2015-03-25 15:46:42 -07:00
willhf bc8854a576 Add test for net=container and links 
Signed-off-by: willhf <willhf@gmail.com>
Upstream-commit: 6dba2d01b5198b43a2fab80176cf2888656c6b56
Component: engine
 2015-03-23 19:50:33 -07:00
Doug Davis 1198ecb944 Add LABEL config check to runconfig compare 
Without this we won't do a proper cacche check because we skip the
labels part of the config.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: b4beb0637a61c6002bb3b0b1dc150899db3b44e4
Component: engine
 2015-03-20 05:55:48 -07:00
Vishnu Kannan 1f50057df8 Adding '--cgroup-parent' flag to docker run. This feature helps users implement more complex 
resource isolation policies on top of what native docker provides.

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 0b1e2b5a553565e99afd7ceda36beab098f506d0
Component: engine
 2015-03-19 02:34:15 +00:00
Arnaud Porterie 90fc12f567 Merge pull request #10568 from LK4D4/logging_drivers 
Logging drivers
Upstream-commit: 1ff5a91007f01d2d61a7b2066db2e164085f0d1b
Component: engine
 2015-03-17 09:45:58 -07:00
Arnaud Porterie 5f00f97ea0 Merge pull request #9882 from ibuildthecloud/labels 
Proposal: One Meta Data to Rule Them All => Labels
Upstream-commit: b6ac111abfbed628a80b67f0b092a248083b354c
Component: engine
 2015-03-16 20:20:05 -07:00
Alexander Morozov 0f5871ff56 Default 'json-file' logging driver and none logging driver 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 47a6afb93f7f71c7ef7dc692c0f50ac81b5a8c98
Component: engine
 2015-03-13 12:13:21 -07:00