207d227709
Merge pull request #12900 from gaurav-gosec/master
...
Make use of iptablesPath variable which has the path of iptables, instea...
Upstream-commit: 5221fd2ba5fbf78ad7a5d4edf039d54ae32141ef
Component: engine
2015-04-30 16:12:03 -07:00
520103a512
Merge pull request #12914 from duglin/FixCPtext
...
Don't wrap 'cp' help too soon.
Upstream-commit: 6bb1986e7f3aad417601c26ad4527c0c2438160e
Component: engine
2015-04-30 16:05:20 -07:00
86214961de
Adding support for GITHUB IGNORES to the engine Dockerfile
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 51977a230715be285f8b8076f43bd1e5803d051c
Component: engine
2015-04-30 15:21:05 -07:00
43117afa87
Don't wrap 'cp' help too soon.
...
Minor thing but docker cp --help was:
Copy files/folders from a PATH on the container to a HOSTDIR on the host
running the command. Use '-' to write the data
as a tar file to STDOUT.
This changes it to:
Copy files/folders from a PATH on the container to a HOSTDIR on the host
running the command. Use '-' to write the data as a tar file to STDOUT.
The \n made the output look funky.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 68ee5bdf96f1653d73e29329506949a765398a40
Component: engine
2015-04-30 14:43:14 -07:00
74df4d944e
Windows: Factor out LXC
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 10e2dbf375b1aebe33bce0646a3a95d34c48d4f8
Component: engine
2015-04-30 14:28:35 -07:00
d1a42b50d1
Windows: Fork execdrivers.go for Windows execdriver
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 71bfb9367880632fd0dbda5e37e926448473ef46
Component: engine
2015-04-30 14:22:30 -07:00
17b585ec32
Windows: Start refactor execdriver/driver.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b255c565ca66b778e87ccf1f8d46963feaee94a0
Component: engine
2015-04-30 14:21:04 -07:00
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
fc1f799f60
Windows: Commit() rwTar defer close
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f9c7772b83e2382f1c3f0539180e9e6f5644fbbc
Component: engine
2015-04-30 12:17:33 -07:00
8259fbca23
Windows: mkdirall volume path aware
...
Signed-off-by: jhowardmsft <jhoward@microsoft.com >
Upstream-commit: 86d1223a29907ffc6afba557b5138cfad7816bb4
Component: engine
2015-04-30 11:59:42 -07:00
fd5203244a
Fix TestApiImagesDelete for --net none build
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 5c86f311c88fafe87e08e58e2cd083fba127f95a
Component: engine
2015-04-30 20:49:28 +02:00
585f4aedc7
Merge pull request #12592 from Mic92/dockerfile
...
Dockerfile: download go libraries before copy vendor
Upstream-commit: 72e9e12fa015d89c5184d6dda69497f1b090331d
Component: engine
2015-04-30 10:29:01 -07:00
29c1f38065
Merge pull request #12857 from nikolas/patch-1
...
Remove incorrect option in docker install command
Upstream-commit: cacf90c9631a7c04a57e1b86663c27fe50bf7ab9
Component: engine
2015-04-30 09:35:20 -07:00
203abf3991
Merge pull request #12771 from runcom/say-bye-to-engine
...
Remove engine
Upstream-commit: 0d0b42547e74e183c7c459a13877bd27c21dba0c
Component: engine
2015-04-30 12:18:16 -04:00
135331b0d1
Merge pull request #12664 from Mashimiao/sysinfo-support-ipv4_forward-check
...
sysinfo: add IPv4Forwarding check
Upstream-commit: fc9033a9c89a86e28d77053b0737aecbb068246d
Component: engine
2015-04-30 11:44:44 -04:00
5b60c778bd
Merge pull request #12837 from mavenugo/integ
...
A few more Integration tests to test Networking related daemon flags
Upstream-commit: 1eb4e96f2125764a38114c7cdcdf2b336b6173f7
Component: engine
2015-04-30 11:12:43 -04:00
72fc3b7751
journald log driver: use CONTAINER_ID field for container id
...
This patch modifies the journald log driver to store the container ID in
a field named CONTAINER_ID, rather than (ab)using the MESSAGE_ID field.
Additionally, this adds the CONTAINER_ID_FULL field containing the
complete container ID and CONTAINER_NAME, containing the container name.
When using the journald log driver, this permits you to see log messages
from a particular container like this:
# journalctl CONTAINER_ID=a9238443e193
Example output from "journalctl -o verbose" includes the following:
CONTAINER_ID=27aae7361e67
CONTAINER_ID_FULL=27aae7361e67e2b4d3864280acd2b80e78daf8ec73786d8b68f3afeeaabbd4c4
CONTAINER_NAME=web
Closes : #12864
Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com >
Upstream-commit: 869ecba652294e069874c83591d6f1b469d7cc32
Component: engine
2015-04-30 10:42:27 -04:00
be98ccedad
Make use of iptablesPath variable which has the path of iptables, instead of using string iptables directly
...
Signed-off-by: Gaurav <gaurav.gosec@gmail.com >
Upstream-commit: 1d5f1bb0f5689be2f0262163ec05930e233f0ad0
Component: engine
2015-04-30 18:22:12 +05:30
058a258a27
Fixing examples given for labels
...
Fixes #12892
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 424a544bb51af6013e218d67f87d27a85d46ca6d
Component: engine
2015-04-30 09:48:54 +02:00
d592b96e50
fix comments for test certain tests
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 987e221607866ae391b632f9de1fd413e5a73150
Component: engine
2015-04-30 15:40:48 +08:00
17d88307f9
sort ports mapping before allocating
...
prioritize the ports with static mapping before dynamic mapping. This removes
the port conflicts when we allocate static port in the reserved range
together with dynamic ones.
When static port is allocated first, Docker will skip those when determining
free ports for dynamic ones.
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com >
Upstream-commit: cd2b019214eb1978ae267786668dc7a8a3702679
Component: engine
2015-04-30 02:18:04 +00:00
0ec0dcde9e
Remove integration tests and port them to integration-cli
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: f7e417ea5e26f11ec43dba64ee153765d2276f40
Component: engine
2015-04-30 01:35:16 +02:00
016ac4bf61
Remove engine mechanism
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 531f4122bdcd4de289f613a5ef010f4c1989f098
Component: engine
2015-04-30 01:35:16 +02:00
71aca0e198
Merge pull request #12574 from ahmetalpbalkan/docs/systemd-dir
...
docs: Add more places docker.service can be at
Upstream-commit: 029cbc10040ab9ee336663889454e5b08d1ef785
Component: engine
2015-04-29 19:07:58 -04:00
24deb92a52
docs: Add more places docker.service can be at
...
More systemd goodness. Documenting where `docker.service` lives under Ubuntu 15.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: c0a1b2d6e99d5c6e29a016da39c1313a54c1cb34
Component: engine
2015-04-29 22:39:48 +00:00
99358033cc
Merge pull request #12439 from Mashimiao/add-err-check-before-getting-term
...
Add error check before getting term
Upstream-commit: 2c4fe2aba3adc4416d09e76e669341e2217ae894
Component: engine
2015-04-29 17:57:01 -04:00
ed128ed101
Do our best not to invoke iptables concurrently if --wait is unsupported
...
We encountered a situation where concurrent invocations of the docker daemon on a machine with an older version of iptables led to nondeterministic errors related to simultaenous invocations of iptables.
While this is best resolved by upgrading iptables itself, the particular situation would have been avoided if the docker daemon simply took care not to concurrently invoke iptables. Of course, external processes could also cause iptables to fail in this way, but invoking docker in parallel seems like a pretty common case.
Signed-off-by: Aaron Davidson <aaron@databricks.com >
Upstream-commit: c271c61feea7d3ea3fcbb3af9f0d9c1f641a8d82
Component: engine
2015-04-29 14:40:25 -07:00
4d11977943
Merge branch 'master' of github.com:docker/docker into kill
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: d0a4f310efb39f8817f08fef3604d653a9da2bb8
Component: engine
2015-04-29 15:06:47 -04:00
9d5c96c875
Moved explicit cleanups into defered action
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 1c073ec1766e0f3cfe28d8f9c2e9a9a37154ece6
Component: engine
2015-04-29 11:41:13 -07:00
4a236a1d62
Merge pull request #12875 from runcom/remove-cfatal-in-goroutine-integration-cli
...
c.Fatal won't fail and exit test inside a goroutine
Upstream-commit: d716f22aadc738a1d086e7713defc1e933b983e1
Component: engine
2015-04-29 10:47:17 -07:00
031175bb41
Merge pull request #11526 from mizzy/append-drop-rule-not-insert
...
Append DROP rule with --icc=false, not insert
Upstream-commit: 6c46c9c83936689937701b3259d969255bcf4ca6
Component: engine
2015-04-29 10:28:11 -07:00
0976611d84
Integration Tests for --icc=false & container Linking using --expose
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: dd0666e64f17329355c77aae1a2ac0fe2fe43402
Component: engine
2015-04-29 10:16:31 -07:00
ce3a344378
Merge pull request #10427 from jfrazelle/option-to-disable-systemd-cgroups
...
Option to configure cgroup manager (adds --exec-opt)
Upstream-commit: 53bef64804c6dae6662a7d55c3bb3e48b3e5dfdf
Component: engine
2015-04-29 10:00:41 -07:00
febe54901d
Integration tests for --ip daemon option
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: ba11929ebdf4cf7798cddc98c4dcfc000b154264
Component: engine
2015-04-29 09:55:49 -07:00
73bcda784f
Integration tests for --fixed-cidr daemon config
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 0e254411b1fe0b5024d4a8e5ade7ce12f4545d8e
Component: engine
2015-04-29 09:55:42 -07:00
e04b055914
Integration tests for --bip daemon flag
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 9c325c3f54b24621b76dee530a855b37cb22abcc
Component: engine
2015-04-29 09:55:34 -07:00
2a71cc5aaf
Integration tests for --bridge daemon flag
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: f3f5ff9d837eecb97eeeb878f0bd416b6ab57cf2
Component: engine
2015-04-29 09:55:25 -07:00
5222cb71a4
Merge pull request #12840 from vdemeester/11598-pkg-fileutils-tests
...
Add coverage on pkg/fileutils
Upstream-commit: 44f8c44e5f99dc3c39d9ab109ac88a058b222df6
Component: engine
2015-04-29 11:15:57 -04:00
6982f607b4
c.Fatal won't fail and exit test inside a goroutine, errors should be handled outside with a channel
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 4203230cbbf46238e38099c9073bdcad5f69a63f
Component: engine
2015-04-29 17:02:22 +02:00
f9039974fb
Add coverage on pkg/fileutils
...
Should fix #11598
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 8454e1a3b24e2e076bb08a2a6b1fcb56efe2924e
Component: engine
2015-04-29 16:27:12 +02:00
53d8f39607
Remove use of "DEBUG" env var from CLI and decouple DEBUG from --log-level
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 534ed8c2d4573e88fcb68b23341504f8949b34b5
Component: engine
2015-04-29 06:20:33 -07:00
93d4e49319
Merge pull request #12870 from coolljt0725/fix_rename_help
...
Fix docker rename help not consistent with other commands
Upstream-commit: f2f8e4c5c9c89e3df59cb3123fa30a0eb6592ddb
Component: engine
2015-04-29 09:14:03 -04:00
b38b865566
Fix docker rename help not consistent with other commands
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 0e752adf550ef4891e40889ea92e12ec3d775a00
Component: engine
2015-04-29 19:37:20 +08:00
382de8a5eb
use CustomSize replace intToString
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 8a2f8992865a706df30eb23bd861444a5ecf6198
Component: engine
2015-04-29 08:30:25 +08:00
12da32d151
Merge pull request #11190 from cyphar/expose-path-sanitisation-wrappers
...
Expose the getResourcePath and getRootResourcePath wrappers.
Upstream-commit: d2f0b9ed976987576483387bc919cb7ffbfa38e8
Component: engine
2015-04-28 18:45:36 -04:00
d550f6b9ae
Merge pull request #12789 from LK4D4/daemon_suite
...
Implement daemon suite for integration-cli
Upstream-commit: f80300e9cf150f9770c8ffce94a4d57acac6aadc
Component: engine
2015-04-28 15:30:36 -07:00
f4e54f0df1
Merge pull request #12820 from runcom/yet-another-sockRequest-refactor
...
Expose whole Response struct in sockRequestRaw
Upstream-commit: cfa3a080c646878414585a8931416538a703a3e0
Component: engine
2015-04-28 13:26:30 -07:00
9af361f6e2
Merge pull request #12245 from buddhamagnet/dockerignore-ignores
...
Add support for exclusion rules in dockerignore
Upstream-commit: 4676ff3fd72f92fc26c3a1d9d588ed544fb46b55
Component: engine
2015-04-28 11:28:46 -07:00
bc3d7f1531
add support for exclusion rules in dockerignore
...
Signed-off-by: Dave Goodchild <buddhamagnet@gmail.com >
Upstream-commit: 6fd8e485c85c4f8ca62578d0840bdeddc4cba151
Component: engine
2015-04-28 18:56:45 +01:00
0d2762c075
Remove incorrect option in docker install command
...
The `-N` option is not compatible with the `-O` option of wget (see the man page).
The example command now matches the example in the script on http://get.docker.com/ .
Signed-off-by: Nik Nyby <nikolas@gnu.org >
Upstream-commit: f04837cf803583dfeb4dcd8311e4e5ef8764c37c
Component: engine
2015-04-28 13:27:04 -04:00
Michael Crosby
Mary Anthony
Doug Davis
John Howard
Antonio Murdaca
Alexander Morozov
Tibor Vass
Brian Goff
Lars Kellogg-Stedman
Gaurav
Vincent Demeester
Qiang Huang
Daniel, Dao Quang Minh
Sebastiaan van Stijn
Ahmet Alp Balkan
Phil Estes
Aaron Davidson
Dan Walsh
Madhu Venugopal
Jessie Frazelle
Doug Davis
Lei Jitang
Ma Shimiao
David Calavera
buddhamagnet
nikolas