1
0
mirror of https://github.com/docker/cli.git synced 2026-01-22 03:22:01 +03:00
Commit Graph

14117 Commits

Author SHA1 Message Date
Megan Kostick
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
moxiegirl
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
Tibor Vass
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
Tibor Vass
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
jhowardmsft
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
Michael Crosby
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
Tibor Vass
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
Michael Crosby
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
Michael Crosby
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
moxiegirl
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
Michael Crosby
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
Michael Crosby
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
Mary Anthony
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
Doug Davis
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
John Howard
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
John Howard
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
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
John Howard
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
Antonio Murdaca
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
Alexander Morozov
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
moxiegirl
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
Tibor Vass
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
Brian Goff
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
Brian Goff
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
Gaurav
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
Qiang Huang
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
Antonio Murdaca
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
Antonio Murdaca
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
Sebastiaan van Stijn
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
Ahmet Alp Balkan
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
Phil Estes
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
Madhu Venugopal
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
Jessie Frazelle
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
Alexander Morozov
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
Madhu Venugopal
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
Jessie Frazelle
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
Madhu Venugopal
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
Madhu Venugopal
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
Madhu Venugopal
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
Madhu Venugopal
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
Doug Davis
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
Antonio Murdaca
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
Vincent Demeester
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
Brian Goff
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
Lei Jitang
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
Ma Shimiao
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
Brian Goff
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
Jessie Frazelle
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
David Calavera
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
Jessie Frazelle
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