toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,476 Commits 3 Branches 295 Tags
b1b57c9cd41beebc3b2b84ae00a5d028eb0373b0
Commit Graph
15476 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Doug Davis 741aa30caf Fix for Daemon crashing when wildcards are used for COPY/ADD 
in the filename and the command itself

Closes #12267

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 82daa43844556953101b201bc5983aed4fbe6233
Component: engine
 2015-04-27 19:09:57 -07:00
Jessica Frazelle 1a116000d5 option to configure cgroups 
Signed-off-by: Jessica Frazelle <jess@docker.com>
Upstream-commit: 2afcd10202283478cbafb21e8c5f90f1236acccc
Component: engine
 2015-04-27 17:50:39 -07:00
moxiegirl e6a94f3935 Merge pull request #12798 from dnephin/add_missing_docs_about_labels 
Add missing API docs about filtering by label
Upstream-commit: aebeefa886ce18d4b0b75c83b9692d24f8eb2b5e
Component: engine
 2015-04-27 17:37:10 -07:00
Jessica Frazelle 7b559d4a5f Add docs for --exec-opt and setting native.cgroupdriver. 
update man pages.
update bash completion.

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: d4bbbe58ddd5916c5f7d253a90fd97e3a4fd59bf
Component: engine
 2015-04-27 17:04:28 -07:00
moxiegirl 9f76c35812 Merge pull request #12796 from moxiegirl/add-to-docs-maintainers 
Adding James and theJeztah to the list
Upstream-commit: 9018f873c8c20f49b33ea9b8b87f3b04bf7b94b2
Component: engine
 2015-04-27 16:32:15 -07:00
Alexander Morozov 5f37bbe0bd Implement daemon suite for integration-cli 
For creating and stopping test daemons automatically.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 57464c32b99b36a2963fb37da86b9870c9a56145
Component: engine
 2015-04-27 15:48:29 -07:00
Brian Goff fb5280aecd Merge pull request #11882 from hqhq/hq_warn_device_cg 
add devices cgroup check as hard requirement
Upstream-commit: a07e96352600fe69ff82aeb39725f142dac06ac7
Component: engine
 2015-04-27 18:42:57 -04:00
moxiegirl 8a023c75f2 Merge pull request #12801 from thewtex/doc-test-ubuntu 
Do Debian installation verification with hello-world image.
Upstream-commit: 13895173eb407128e00c38f1b183ba42375452b6
Component: engine
 2015-04-27 15:09:25 -07:00
Phil Estes 0b5b481a6d Merge pull request #12828 from tdmackey/trivial-spelling 
trivial: typo cleanup
Upstream-commit: 0153edcda1527cd19f5952046b51c4e8358d01ed
Component: engine
 2015-04-27 17:05:46 -04:00
Tibor Vass 72bf48b9df Merge pull request #12794 from runcom/small-cleaning 
Small if err cleaning
Upstream-commit: 62a85fe2026f3f5114f19638baf53d19a51d39c0
Component: engine
 2015-04-27 17:02:27 -04:00
Brian Goff e4ed8d93e4 Fix undead containers 
When a container has errors on removal, it gets flagged as dead.
If you `docker rm -f` a dead container the container is dereffed from
the daemon and doesn't show up on `docker ps` anymore... except that the
container JSON file may still be lingering around and becomes undead
when you restart the daemon.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: c3c08f76bec023218b632e4c688ff9fcda11fcef
Component: engine
 2015-04-27 16:45:51 -04: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
Daniel Antlinger 6b34bbbde8 fixed TestDiffEnsureDockerinitFilesAreIgnored is too long #12672 
Signed-off-by: Daniel Antlinger <d.antlinger@gmx.at>
Upstream-commit: 50868b2c575c26492f4c49a79d2f3b51ec68a229
Component: engine
 2015-04-27 13:24:15 -07:00
Brian Goff b316b8880f Merge pull request #12719 from fntlnz/12675-test-events-emit 
Parallelize TestEventsLimit
Upstream-commit: 2f513db31df9ae45cc3689b23b673aabe8c7ad87
Component: engine
 2015-04-27 16:02:33 -04:00
Antonio Murdaca 954f940156 Small if err cleaning 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 844538142d95c1b7dda1bb2903179510105fe9b5
Component: engine
 2015-04-27 21:50:33 +02:00
Lorenzo Fontana 6143f43f8d Parallelize TestEventsLimit 
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com>
Upstream-commit: 40779b28bb04dca6178ba17eaeb93265e2974ee1
Component: engine
 2015-04-27 21:14:00 +02:00
Jessie Frazelle 7cb48fca64 Merge pull request #12532 from ankushagarwal/eliminate-json-marshal 
Eliminate json.Marshal from graph/export.go and volumes/volume.go
Upstream-commit: 531ec3cac92d482ac0d45b0aea6727945f257507
Component: engine
 2015-04-27 13:54:20 -05:00
Tibor Vass 6a2c490ba2 Merge pull request #12333 from Mashimiao/clean-up-viz 
Clean up viz code
Upstream-commit: 572ba9cb407f3c383367c67b1a6d3da612ece4a7
Component: engine
 2015-04-27 14:13:03 -04:00
Matt McCormick 602d598095 Do Debian installation verification with hello-world image. 
The hello-world image is recommended as a verification image and it is smaller
than Ubuntu.

Signed-off-by: Matt McCormick <matt.mccormick@kitware.com>
Upstream-commit: b6cfe7ca07722cee22345602595fc8fb928dbe79
Component: engine
 2015-04-27 13:53:30 -04:00
David Calavera a8e7d51077 Merge pull request #12819 from Microsoft/10662-volumesrefactor 
Windows: Refactor volumes
Upstream-commit: f9c27bda1ec9be667520900e1baa0e996f46f80e
Component: engine
 2015-04-27 10:25:41 -07:00
Tibor Vass b2c23588b8 Merge pull request #12793 from runcom/bye-unmarshal 
Replace json.Unmarshal() with json.Decoder().Decode()
Upstream-commit: 4ddd448490ba2a98a158bd3339e958b568fdc804
Component: engine
 2015-04-27 13:19:43 -04:00
Brian Goff ac15f3e4a0 Merge pull request #12818 from Microsoft/10662-nocontainercheckonwindows 
Windows: Info no containerized check
Upstream-commit: 97b35bab8172408550397bef94cd618c7e9a120e
Component: engine
 2015-04-27 12:56:28 -04:00
Antonio Murdaca d1facd32fc Expose whole Response struct in sockRequestRaw 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: bb1c576eb3024f7fb4242d76dc835b7c4dd85c5b
Component: engine
 2015-04-27 18:49:00 +02:00
John Howard ca495f5d0d Windows: Refactor volumes 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ba1725a94ee75603d3a21e0580be3954fc689137
Component: engine
 2015-04-27 09:27:15 -07:00
Brian Goff b3b10cf345 Merge pull request #12807 from jmzwcn/patch-2 
Remove dead code from daemon/daemon.go
Upstream-commit: 6856c69c41880946125357ae11be00ac07de08b8
Component: engine
 2015-04-27 12:10:30 -04:00
Alexander Morozov 563a5f77d4 Merge pull request #12809 from runcom/remove-cfatal-goroutine-attachws 
Remove c.Fatal from goroutine in TestGetContainersAttachWebsocket
Upstream-commit: 5305e675b554a7451433bbd64bca4d6f3070a45b
Component: engine
 2015-04-27 08:59:47 -07:00
Jessie Frazelle 3458282944 Merge pull request #12714 from noxiouz/fix_race_stats_collector 
statsCollector: fix data race in run()
Upstream-commit: 9f684c85926fd5280e0bc604507d5b5f80353d48
Component: engine
 2015-04-27 10:57:56 -05:00
Alexander Morozov 4342c93053 Merge pull request #12799 from aidanhs/aphs-fix-net-container-deadlock 
Prevent deadlock on --net=container:<self>
Upstream-commit: 02d73d910fa56e89a2d999b95b0fa0738332fed7
Component: engine
 2015-04-27 08:46:22 -07:00
John Howard 513af8ec95 Windows: Info no containerized check 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ab97303caed2a7be474e2c4ff7a55af9d6c8c3cc
Component: engine
 2015-04-27 08:38:01 -07:00
Phil Estes 32c7f6f272 Merge pull request #12803 from ZJU-SEL/remove_useless_export_httpcall 
remove useless http call from export
Upstream-commit: 8ec22ae87dac85f8f06f560842a0d001977a8cda
Component: engine
 2015-04-27 11:33:13 -04:00
Zhang Wei 25e6857dc9 improve docker man page 
fix issue #12708:
"docker man page is misleading about format of commands"

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 29f379ea6e2a68d8ac4bf41d3559a52066a275a0
Component: engine
 2015-04-27 23:27:35 +08:00
Brian Goff 5e258c2907 Merge pull request #12783 from duglin/Issue12763-LinkedEnvs 
A fix for = in env values in linked containers
Upstream-commit: 8dc07af52f1822a1d337f005c6c4292611d3313d
Component: engine
 2015-04-27 10:50:14 -04:00
Doug Davis 55c6259a4a Merge pull request #12616 from cpuguy83/remove_uneeded_sleeps 
remove some uneeded sleeps in tests
Upstream-commit: 325c0404c84db11630cfcc24ac93cb82763de511
Component: engine
 2015-04-27 10:42:40 -04:00
Brian Goff bb3c396980 remove some uneeded sleeps in tests 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 9e0ffae864d6679084e84e2e27cbb9d350f6dbae
Component: engine
 2015-04-27 10:14:29 -04:00
Aidan Hobson Sayers 270e43ec62 Prevent deadlock on attempt to use own net 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: f30d1c1835618eadea5d0a68d1301dffd9f09b22
Component: engine
 2015-04-27 14:57:37 +01:00
Antonio Murdaca e570165119 Remove c.Fatal from goroutine in TestGetContainersAttachWebsocket 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: c7b2632dc8550c8aa80ebd8b229809ac37fa53e1
Component: engine
 2015-04-27 13:56:55 +02:00
jmzwcn ad85faa2ca Remove dead code from daemon/daemon.go 
fix #12492
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
Upstream-commit: accbbfeae4c2f3ceb68060e08e46e382cdefc975
Component: engine
 2015-04-27 15:50:47 +08:00
He Simei 5d5dd54df9 remove useless http call from export 
Signed-off-by: He Simei <hesimei@zju.edu.cn>
Upstream-commit: 6d9439c627e36349679249d991400da45eb75587
Component: engine
 2015-04-27 12:41:03 +08:00
Jinsoo Park f524e9a7da add library files for socat in mkimage-unittest.sh 
in https://docs.docker.com/articles/ambassador_pattern_linking/
svendowideit/ambassador images is from docker-ut built using this script
and uses socat but socat complains as follows
socat: error while loading shared libraries: libreadline.so.5: cannot open shared object file: No such file or directory
socat: error while loading shared libraries: libssl.so.1.0.0: cannot open shared object file: No such file or directory
socat: error while loading shared libraries: libcrypto.so.1.0.0: cannot open shared object file: No such file or directory
socat: error while loading shared libraries: libtinfo.so.5: cannot open shared object file: No such file or directory
/usr/lib/x86_64-linux-gnu/lib{crypto,ssl}.so* lib are symlinks so removing -P option from cp
adding libreadline.so and libtinfo.so

Signed-off-by: Jinsoo Park <cellpjs@gmail.com>

update libssl.so path

Signed-off-by: Jinsoo Park <cellpjs@gmail.com>

Remove mkimage-unittest.sh

Signed-off-by: Jinsoo Park <cellpjs@gmail.com>
Upstream-commit: f930c86cb1ea94525ecc8a0331277afad99d4c1a
Component: engine
 2015-04-26 23:35:19 -04:00
Daniel Nephin b5c5cd32f2 Add missing API docs about filtering by label. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
Upstream-commit: cfd0f53b03d26c370e37abf651d7f481ee8c6912
Component: engine
 2015-04-26 15:36:01 -04:00
moxiegirl 145f0ac265 Merge pull request #12787 from epc/copyedits 
Copy edits for typos
Upstream-commit: 6cba3109c2a9c0c20d2541605a9aa7873225a224
Component: engine
 2015-04-26 10:40:18 -07:00
Mary Anthony 520d5524c2 Adding James and theJeztah to the list 
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: ba79f0ca1f389e3c87c19b2c326b3b6afbebc8ef
Component: engine
 2015-04-26 10:32:43 -07:00
Antonio Murdaca e5f7f8da6f Replace json.Unmarshal with json.Decoder().Decode() 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 26543e03095eaa45d9afc12c029f07539323fee5
Component: engine
 2015-04-26 15:02:01 +02:00
David Calavera d5259f3ff9 Merge pull request #12734 from sergey-alekseev/sergey-alekseev-patch-1 
Fix documentation typo in articles/basics.md
Upstream-commit: 92f4bd59ce941233b295ec2b2e5faa974105ad40
Component: engine
 2015-04-25 20:33:55 -07:00
Alexander Morozov 13d6b715bf Merge pull request #12728 from HuKeping/addtest 
Add test for REST API container rename
Upstream-commit: fefb8367663e5f97f8c85418691b10c6e9356134
Component: engine
 2015-04-25 17:01:10 -07:00
Nathan LeClaire 04f8bd2003 Migrate integration test to new method 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Upstream-commit: 9dbe12b792a46538c01862930c85ace18dbe14f3
Component: engine
 2015-04-25 17:12:01 -04:00
Marianna b3b4c052f9 Make the docs for --cgroup-parent better 
Signed-off-by: Marianna <mtesselh@gmail.com>
Upstream-commit: a8dfafc98642455ed83f9422f3174fa828dde4df
Component: engine
 2015-04-25 16:35:28 -04:00
Nathan LeClaire 0a0035ed72 Add dep to test 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Upstream-commit: 65aba0c9d6a72fc89f87c328e9ca21e20bf3cf7a
Component: engine
 2015-04-25 15:25:52 -04:00
Nathan LeClaire 2f02e8950c Fix gofmt 
Mischevious comma is mischevious

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Upstream-commit: f039c699a40397b71f05838e9a9c67100ae474c6
Component: engine
 2015-04-25 15:25:52 -04:00
Marianna 43c42369ac Add test for cgroup parent flag for build 
Signed-off-by: Marianna <mtesselh@gmail.com>
Upstream-commit: f40dd69c97a5a3797f07d52fe5f76e296ef629dc
Component: engine
 2015-04-25 15:25:52 -04:00