ba5fba5a8d
Update go-patricia to 2.1.0
...
This includes a fix for the minor v2 API change introduced by 341a37095f👍
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: b447fef7ecb740bc0f9ece75e10926fc5f121b5c
Component: engine
2015-05-02 23:25:57 -06:00
3ce54cf19d
Merge pull request #12893 from vdemeester/12892-fix-labels-documentation
...
Fixing examples given for labels
Upstream-commit: 0ad6f901277638984c89e185bc18a25cb508b25f
Component: engine
2015-05-02 22:29:08 -04:00
81f3cafcc8
Merge pull request #12922 from tianon/complete-repos-on-pull-all
...
Only complete repos with "docker pull -a"
Upstream-commit: b58f48ae42f348f573d7874fa8a29bd816cd821a
Component: engine
2015-05-02 22:19:37 -04:00
809dae68ab
Remove unused error return
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 4aff563282c4d467575aed006642a22d673d4cb7
Component: engine
2015-05-02 15:57:57 +02:00
e0a352671b
Merge pull request #12932 from tianon/finally-remove-archive-tar-copy
...
Finally remove our copy of "archive/tar" now that Go 1.4 is the minimum!
Upstream-commit: 3ea59f8991a4d70254582759044316e522a09ee9
Component: engine
2015-05-01 15:43:13 -07:00
57496db316
Merge pull request #12924 from runcom/provide-struct-to-cli-stream
...
Provide a struct to configure cli streaming
Upstream-commit: 393678474f7364b44e7b26b5e9a99aabf1762724
Component: engine
2015-05-01 15:10:58 -07:00
7bd38d02c2
Finally remove our copy of "archive/tar" now that Go 1.4 is the minimum!
...
IT'S ABOUT TIME. 🎉
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 576985a1dcd76a9af2c5c483e6f12035a1f47b96
Component: engine
2015-05-01 16:01:10 -06:00
9893237498
Merge pull request #12720 from DarianAnjuhal/fix-ensure-dockerinit
...
TestDiffEnsureDockerinitFilesAreIgnored is too long
Upstream-commit: 1f2f3db1e34a72f4b739ce3654fcca7dbe427282
Component: engine
2015-05-01 14:52:34 -07:00
a71a03ee87
Merge pull request #12930 from tianon/build-deb-stretch
...
Add "debian:stretch" as another build-deb target
Upstream-commit: 4d88bf3ecb0cb5c8a9bc7310ce13fc7ea4afd1ad
Component: engine
2015-05-01 14:42:19 -07:00
165f28e440
Merge pull request #12929 from tianon/dockerignore-fffff
...
Remove hacky "cp .../Dockerfile.build ." in "build-deb"
Upstream-commit: e6d3ebd939360ccc51ef987245264631cc3cf788
Component: engine
2015-05-01 14:32:26 -07:00
5de2c67ffe
Merge pull request #12928 from LK4D4/firewalld_race
...
Fix race in FirewalldInit
Upstream-commit: ab74b327c6bf8f3ff19a5394a1912e2322660b58
Component: engine
2015-05-01 14:23:47 -07:00
11438fc8b6
Add "debian:stretch" as another build-deb target
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: d317b7c89159f9795fa7eb69504191208b3c0b3f
Component: engine
2015-05-01 15:03:08 -06:00
c2d48a3c7b
Remove hacky "cp .../Dockerfile.build ." in "build-deb"
...
Turns out that `-f` on a file that's in `.dockerignore` actually does work. No idea why it wasn't when I was doing this before, but oh well! 🤘
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 9f5730e131699caaf6f8f6f941d5942d68295055
Component: engine
2015-05-01 14:45:00 -06:00
c72735069d
Fix race in FirewalldInit
...
It was possible that signalHandler won't start because connections is
not assigned.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: a05bcd12c44b4daada51267d89fd9ac53812be02
Component: engine
2015-05-01 13:35:54 -07:00
cad4e1508b
Provide a struct to configure cli streaming
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: d9639409fd54ee6955793474fa9a5bac1e583c77
Component: engine
2015-05-01 20:23:44 +02:00
eb1863c913
Merge pull request #12921 from hqhq/hq_fix_rmlink
...
fix docker rm name issue
Upstream-commit: e1df16b3a3f42c77234825fb504a657458a8abba
Component: engine
2015-05-01 11:15:25 -07:00
b42d429d30
Only complete repos with "docker pull -a"
...
With this, `docker pull deb<tab>` will show all `debian:*` tags, as before, but `docker pull -a deb<tab>` will complete directly to just `debian`. 👍
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 380b8737523edf1c2575208a14a8673684758692
Component: engine
2015-05-01 10:04:24 -06:00
57ef45bb87
Docs adding uninstall instructions
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
Upstream-commit: 5eee4058feaa7f06348941d267f4d76178ab3de4
Component: engine
2015-05-01 08:10:56 -07:00
96a8cfc20a
fix docker rm name issue
...
Addresses https://github.com/docker/docker/issues/12308
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 79f13d1497b073113f713e903e934dafcf78c42f
Component: engine
2015-05-01 22:26:40 +08:00
fcc891cdff
Merge pull request #12915 from moxiegirl/implement-github-ignores
...
Adding support for GITHUB IGNORES to the engine Dockerfile
Upstream-commit: 7e864a57bcf4fff84a631e83a3c960613c4e4486
Component: engine
2015-05-01 06:29:27 -07:00
964532d377
Merge pull request #12772 from Microsoft/10662-moveworkdirchecktoserver
...
Windows: Move workdir check daemon-side
Upstream-commit: 79d086c47d61f6da522a0e586005a02dae9b5ede
Component: engine
2015-05-01 00:24:40 -04:00
baf4d2dbf5
Merge pull request #12716 from Microsoft/10662-defaultlistener
...
Windows: Change default listener to HTTP
Upstream-commit: abf1a14bfe0a9a384d8551a56a7f555b71ea6662
Component: engine
2015-05-01 00:11:54 -04:00
c1ee29b6e9
Windows: Change default listener to HTTP
...
Signed-off-by: jhowardmsft <jhoward@microsoft.com >
Upstream-commit: cbf9a64cb5f69ce07598646ac26be247c7967cbb
Component: engine
2015-04-30 19:49:45 -07:00
46a5d01a59
Merge pull request #12767 from Microsoft/10662-commitdefertarclose
...
Windows: Commit() rwTar defer close
Upstream-commit: 66077a9d692d8f5b5dd71bc848c359d3df092998
Component: engine
2015-04-30 18:06:09 -07:00
bdf088b5fb
Merge pull request #12829 from Microsoft/10662-execdriver-driver-refactor
...
Windows: Start refactor execdriver/driver.go
Upstream-commit: e9c9682333499f6a063404ad9df5db1385e75bbf
Component: engine
2015-04-30 20:36:10 -04:00
c15edc1320
Merge pull request #12831 from Microsoft/10662-nolxconwindows
...
Windows: Factor out LXC
Upstream-commit: 6b42d72d86737fa6df102379ec3c9964204dd782
Component: engine
2015-04-30 17:25:15 -07:00
b17cfc7a0a
Merge pull request #12841 from Mashimiao/use-CustomSize-to-replace-intToString
...
use CustomSize replace intToString
Upstream-commit: d2e380b687ddf7fa83ff3a17add41278300926b7
Component: engine
2015-04-30 17:24:41 -07:00
6b9dd0750f
Merge pull request #12901 from hqhq/hq_fix_test_comment
...
fix comments for test certain tests
Upstream-commit: 7e7b6a20bd4ea60954b9d17823bf4af00f27977e
Component: engine
2015-04-30 17:08:23 -07:00
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
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
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
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
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
