toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,179 Commits 3 Branches 295 Tags
ed128ed10154cfcab45068e5a99cfa686fbd5e94
Commit Graph
15179 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Davidson 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
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
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
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
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
buddhamagnet 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
moxiegirl d9d6af7cf9 Merge pull request #12644 from psftw/official-repos-rewrite 
Rewrite Official Repos page.
Upstream-commit: dde5ff2872bb76ccbc279f4cd52d7c75565a3b75
Component: engine
 2015-04-28 08:57:29 -07:00
moxiegirl 65ecb50b1e Merge pull request #12814 from vbatts/vbatts-rhel_updates 
RHEL updates
Upstream-commit: 6113eab1740a0cfe8d6f504cc270027c211ae864
Component: engine
 2015-04-28 08:51:35 -07:00
Alexander Morozov 95218301ea Merge pull request #12844 from hqhq/hq_fix_inspect_format 
fix a minor inspect format issue
Upstream-commit: 868d5dca74eda72a9de2ab4baf6ff1ce10607d1c
Component: engine
 2015-04-28 08:50:52 -07:00
Vincent Batts 24c022aa2a rhel.md: adding link to most recent issue 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 9b365e0845bf8e74cef23db2233e721b90ae4339
Component: engine
 2015-04-28 11:28:33 -04:00
Vincent Batts 237e42e47c rhel.md: bump the kernel version for RHEL6 
Closes #9856

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 179b6ddc353fd766125df19bf61b00a39a13cd04
Component: engine
 2015-04-28 11:28:33 -04:00
Vincent Batts 112a3bf0ea rhel.md: update RHEL6 from 6.5 to 6.6 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: ed40c0a9a48e54dbe341ad718d9362a268467378
Component: engine
 2015-04-28 11:28:23 -04:00
Phil Estes 14fa064d31 Merge pull request #12826 from cpuguy83/12825_fix_leftover_container_json 
Fix undead containers
Upstream-commit: 67da055cebcaccd059daec88080a339b4c9e6b2c
Component: engine
 2015-04-28 08:11:40 -04:00
moxiegirl ab7005a800 Merge pull request #12723 from moxiegirl/carry-11296 
Integrating Windows Testing Material
Upstream-commit: 6ac481296d06e0d6d4eb03dc8a23c92319036c26
Component: engine
 2015-04-28 04:56:17 -07:00
Qiang Huang d6802adb29 fix a minor inspect format issue 
Before, inspect cont1 cont2 shows:
[{
    xxx
}
,{
    xxx
}
]
After, it shows:
[
{
   xxx
}
,{
    xxx
}
]

Because `func (*Encoder) Encode` always followed by a newline character,
so it's difficult to put '}' and ']' one the same line.

To get symmetry, above is our choice.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: c7812f01c7269c713c2243fe8a69b55cdb77b72a
Component: engine
 2015-04-28 18:51:04 +08:00
Peter Salvatore 00b8817331 Rewrite Official Repositories page. 
The existing page is focused on listing a set of requirements for
proposing a new repository.  This information has become outdated and is
duplicated in the `docker-library/official-images` and
`docker-library/docs` GitHub repositories.  This PR rewrites the
Official Repositories page to describe what they actually are, and
defers to GitHub/IRC for the subset of users that are interested in
contributing.  I also removed the requirement to contact
partners@docker.com and made it optional to reduce the barrier to entry.

Signed-off-by: Peter Salvatore <peter@psftw.com>
Upstream-commit: 8f52eb7b827d658d6974056460afd722a5cb040f
Component: engine
 2015-04-28 00:37:17 -04:00
Jessica Frazelle 1a5a13dff9 add initial docs for windows client testing 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

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

docs: crop and optimize images

Cropped and optimized images.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

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

Testing and updating the Windows material

Signed-off-by: Mary Anthony <mary@docker.com>

checkpoint

Signed-off-by: Mary Anthony <mary@docker.com>

Fitting the Windows specific material into the contributor guide

Signed-off-by: Mary Anthony <mary@docker.com>

Entering James comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: af8efab7561484debffa3f6782eaea199fa22506
Component: engine
 2015-04-27 21:21:53 -07:00
Sebastiaan van Stijn e914ea7488 Merge pull request #12817 from WeiZhang555/man 
improve docker man page
Upstream-commit: 779939e334ea33081d3ad7a4364be1b1b4801c3d
Component: engine
 2015-04-27 22:59:11 -04: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
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