Commit Graph
14731 Commits
Author SHA1 Message Date
Peter Esbensen 64b84b5716 Fixes #11721 removed GenerateRandomString
Signed-off-by: Peter Esbensen <pkesbensen@gmail.com>

gofmt

Signed-off-by: Peter Esbensen <pkesbensen@gmail.com>
Upstream-commit: 6896016b7c7a95ac33c77a222c359cf35a471eb9
Component: engine
2015-04-02 08:07:52 -07:00
Peter Esbensen aa32736c19 Added unit tests for stringutils GenerateRandomAlphaOnlyString and GenerateRandomAsciiString
Signed-off-by: Peter Esbensen <pkesbensen@gmail.com>
Upstream-commit: 11287f77144954fe82f75ade671da739559c664f
Component: engine
2015-04-02 07:12:47 -07:00
Brian Goff b507a74819 Add cpuguy83 to maintainers.people
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 6ac845edadbf6374a9ee53f105c34265aed32d42
Component: engine
2015-04-02 08:51:47 -04:00
Tibor Vass 088a52cbda Merge pull request #11149 from duglin/8667-AdvancedVars
Add support for advanced ${} uses
Upstream-commit: 9707286a5cecde3eee3c83e3c2da65df8e59d04e
Component: engine
2015-04-02 08:25:49 -04:00
Chen Hanxiao 5eb5b13997 docs: keep the style of docker-commit consistent with docker-import
add a pair of accent mark around dockerfile commands
in docker-commit, as the same thing in docker-import.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: 8fa03df8850c6eb3ecdce1266c72ed8d7af3a5bb
Component: engine
2015-04-02 05:01:14 -04:00
unclejack 842af15e9f api/server: fix profiler HTTP serving
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 3bea892d5458fc627f2ebe26f44a09df018d1fcc
Component: engine
2015-04-02 09:53:40 +03:00
Mary Anthony 2fbe877abc Updating with man pages for distribution
Went through the man pages to update for the
v2 instance. Checked against the commands.

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: b6d55ebcbc93ce66aa9906aa87e1081f21ba1650
Component: engine
2015-04-01 21:02:19 -07:00
Jessica Frazelle 3c9c482afa TestVolumesFromHasPriority fix race
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
Upstream-commit: c447fd339a9293ea528ba0c8f4154cf1f953186c
Component: engine
2015-04-01 18:06:28 -07:00
Jessica Frazelle 51cc2549fc fix device test on lxc, on lxc in contianers there are no dirs with devices in /dev, but this works outside a container...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
Upstream-commit: f472c7236f7f7ea069b2997391569e5ec60981ab
Component: engine
2015-04-01 17:47:36 -07:00
Lei Jitang c94431c226 Add MEMCG_SWAP_ENABLED to check-config.sh
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: a9588158b54bc8866bddfa0445c14831e02ebbbc
Component: engine
2015-04-02 08:38:39 +08:00
Darren Shepherd 82a7741d14 Make server_windows.go consistent with server_linux.go
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: 7433c9c92a9d2b53331f729249ddbbfa70cb76de
Component: engine
2015-04-01 17:31:15 -07:00
Darren Shepherd acae61c8ad Infer type
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: 34f44c642faa94ae5d5677d49f690533c67cdf5e
Component: engine
2015-04-01 17:31:09 -07:00
Andrea Luzzardi 9135f9f621 Merge pull request #10745 from jfrazelle/device-dir
Mounting a dir of devices like /dev/snd should mount all child devices
Upstream-commit: b9be50b578f86e858113b9c334e1748e15b63263
Component: engine
2015-04-01 16:53:01 -07:00
Sebastiaan van Stijn 0b52fe32d3 docs: fix bullet list and missing label filter
Some bullet lists didn't render as bullet-lists because
of a missing newline.

Also added missing "label" filter for `docker ps` and
slightly re-worded the header above the supported filters.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 37c7f3a2046dc01c6c58ed64638faf136dd0682c
Component: engine
2015-04-02 01:48:28 +02:00
Arnaud Porterie d12a5b6e48 Merge pull request #12007 from crosbymichael/fix-oom-hang
Return closed channel if oom notification fails
Upstream-commit: 3f77f627d041ae388f4f591a2187be225629d6b7
Component: engine
2015-04-01 15:59:20 -07:00
Jessica Frazelle c8180f954e Mounting a directory of devices like /dev/snd should mount all child devices.
I have seen a lot of people try to do this and reach out to me on how to mount
/dev/snd because it is returning "not a device node". The docs imply you can
_just_ mount /dev/snd and that is not the case. This fixes that. It also allows
for coolness if you want to mount say /dev/usb.

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

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)

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 664004ed0c6c99369720a00f5673f1e106d9496d
Component: engine
2015-04-01 15:57:41 -07:00
Arnaud Porterie 8f29ea870c Merge pull request #12005 from LK4D4/bump_docs
Bump API version and docs to v1.19
Upstream-commit: 3fe7a3d53766de88cddd0e1c324869183cd609cf
Component: engine
2015-04-01 15:34:28 -07:00
Vincent Batts 8391dba9e0 Merge pull request #11099 from iavael/bugfix/tar-symlinks
Fixed handling hardlinks to symlinks in tar stream
Upstream-commit: 88b8fc10e3dc5613859da31900e0a1b0bbb303c6
Component: engine
2015-04-01 18:34:00 -04:00
Michael Crosby aeb6266db3 Return closed channel if oom notification fails
When working with Go channels you must not set it to nil or else the
channel will block forever.  It will not panic reading from a nil chan
but it blocks.  The correct way to do this is to create the channel then
close it as the correct results to the caller will be returned.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 7061a993c5b620d6e68450f1b90f3458bfa1add0
Component: engine
2015-04-01 15:30:48 -07:00
Alexander Morozov 8815a68d5e Merge pull request #12006 from icecrime/add_kitematic_to_readme
Add Kitematic to README.md
Upstream-commit: 2c0ee48224d4831db55b66073f4b4a1f1a0d86f5
Component: engine
2015-04-01 14:41:41 -07:00
Arnaud Porterie 444eef9af1 Add Kitematic to README.md
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 7bd250c74d1dbc64be2ccb0978e1babd55d18afa
Component: engine
2015-04-01 14:38:49 -07:00
Nick Irvine 2f0180cd18 Add some new graphics for installation and understanding docs
Fixes: #11552

- scalable SVG
- uses colours from the rest of the page
- emphasizes that boot2docker is the ordinary Linux setup in a VM
- Add new graphic for architecture diagram
- Add windows boot2docker diagram
- Add windows diagram to documentation
- Remove old PNGs; replaced with SVGs
- Add redirects for new SVG versions of installation diagrams

Signed-off-by: Nick Irvine <nfirvine@nfirvine.com>
Upstream-commit: 1a4d2a5c8b4b130e93c652743bab4547b8bf9aba
Component: engine
2015-04-01 14:24:53 -07:00
Alexander Morozov cd5f423b1f Bump API version and docs to v1.19
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 81f9b72c648142745c63ab0ba2b495646dccd88d
Component: engine
2015-04-01 13:40:56 -07:00
Tibor Vass 80f31b5c3f Merge pull request #11974 from crosbymichael/registry-jobs
Remove jobs from registry.Service
Upstream-commit: 4467b6a2cbb2b075803e4a6cc10672871cb6c323
Component: engine
2015-04-01 16:32:41 -04:00
Simon Leinen e4993ed96b Make explanation consistent with command
To reduce confusion of the reader.  Fixes a likely cut & paste error.

Signed-off-by: Simon Leinen <simon.leinen@gmail.com>
Upstream-commit: b58c4b8e689121ab4869472405a3db89094ac4de
Component: engine
2015-04-01 21:54:21 +02:00
Alexander Morozov f573d53da8 Merge pull request #11990 from duglin/11985-RemoveDeadCode
Remove dead code looking for non-existent err msg
Upstream-commit: 7101419c1c44083cf8ba30b4469d4cde4ab05e55
Component: engine
2015-04-01 10:46:10 -07:00
Jay c3eb3fd267 Added information about accessing host directory on Windows.
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 6e46204ab80b6df52c168fc06873280fc051d768
Component: engine
2015-04-01 13:36:43 -04:00
André Martins d25b9e78b6 Fixes docker events since beginning of unix time
Fixes issue #11555
Applied a workaround to check if since and until flags are valid or not.

Signed-off-by: André Martins <martins@noironetworks.com>
Upstream-commit: 8f7ac20bacfa6964ea830bfc6dfd4fc8c66bc9c3
Component: engine
2015-04-01 18:14:59 +01:00
Alexander Morozov d47bbc4765 Merge pull request #11949 from MabinGo/fix_randombug_in_eventtest
Fix random error in cli events test
Upstream-commit: 624de8a9cd5652d0d685596d490997f7f2e83536
Component: engine
2015-04-01 09:26:48 -07:00
Doug Davis 3e035d76a2 Add support for more advanced ${xxx:...} syntax
Just ${xxx:+...} and ${xxx:-...} for now

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 39908fc6d9a13f0d44196475ba938b6cc352fdbe
Component: engine
2015-04-01 08:11:15 -07:00
moxiegirl 2a679a09de Merge pull request #11969 from powo/patch-1
Update networking.md (IPv6 wrong prefix)
Upstream-commit: 39711c8b26ccbeace0a6ec9246ad0ba65e468904
Component: engine
2015-04-01 07:45:31 -07:00
Doug Davis 99e92a4e37 Remove dead code looking for non-existent err msg
Closes #11985

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: d351aef8afc5a215668248652aad52856949eaa0
Component: engine
2015-04-01 07:37:10 -07:00
moxiegirl 97627eb7d2 Merge pull request #11972 from thaJeztah/docs-fix-heading-level
docs: fix heading level of logging drivers
Upstream-commit: dc564d8cf8ba5221edcddc267d0ae7ac9a2b73da
Component: engine
2015-04-01 07:34:45 -07:00
moxiegirl 631fb354cf Merge pull request #11982 from sunyuan3/docker-run
Fix typoes in docker-run.1.md
Upstream-commit: f73109b8833517e2d095e5e9be0acaa17284738e
Component: engine
2015-04-01 07:32:06 -07:00
James Turnbull bd9cf26ed2 Merge pull request #11954 from ankushagarwal/#11953
Use different host and container port for clarity
Upstream-commit: a73b7354a6d782d180cc01cec8b45f6253ebf72b
Component: engine
2015-04-01 09:21:15 -04:00
Yuan Sun df6b8b71c3 Fix typoes in docker-run.1.md
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: a44451d40eb3e1b3d19a0525f70736406c66d2d1
Component: engine
2015-04-01 17:09:01 +08:00
Deng Guangxing 5a7a97d2b6 docker info show logging driver info
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: f5a401d3fe2e8c74e6b6a38e9073b843b16fae68
Component: engine
2015-04-01 16:05:14 +08:00
Mabin 562a382719 Fix random bug in cli events test
Signed-off-by: Mabin <bin.ma@huawei.com>
Upstream-commit: e15c3e36cc5559c3ec17179d8740b2841709daf5
Component: engine
2015-04-01 11:00:01 +08:00
Lei Jitang cf84c0b3d1 Add some missing option to bash completion
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 7105f93a72db06f9c57d6eae413883fef88102d7
Component: engine
2015-04-01 10:35:05 +08:00
Michael Crosby a6e32781c9 Merge pull request #11975 from duglin/FixOOMTest
Increase timeout on TestRunOOMExitCode test
Upstream-commit: 98cfa2aecdb208ebc30dfc17ee3ed8ebbb05a72a
Component: engine
2015-03-31 17:24:26 -07:00
Doug Davis e8ab23fa21 Increase timeout on TestRunOOMExitCode test
I can never get it to work for me when its just 3 seconds.
With this change it generates the OOM message around 17 seconds, but
I increased the timeout to 30 for people with slower machines

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 8d1455d88b66011713da67098dc3464b897af9cd
Component: engine
2015-03-31 16:57:43 -07:00
Michael Crosby 59fa60cd98 Merge pull request #11930 from unclejack/broadcastwriter_refactor
pkg/broadcastwriter: use []byte to lower alloc
Upstream-commit: e736f16bbd15bd9fa10fac22cd3016050a91e6e5
Component: engine
2015-03-31 16:47:23 -07:00
Michael Crosby 753b8ae08c Remove jobs from registry.Service
This makes `registry.Service` a first class type and does not use jobs
to interact with this type.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 03d3d79b2b3f8b720fff2d649aff0ef791cff417
Component: engine
2015-03-31 16:38:04 -07:00
Jessie Frazelle ac9aaec491 Merge pull request #11967 from LK4D4/fix_panic
Avoid ServeApi race condition
Upstream-commit: 596ddef7d73273103a7b900fa46d4392e1d3e27b
Component: engine
2015-03-31 16:37:32 -07:00
Sebastiaan van Stijn 1394c160e0 Fix heading level of logging drivers
Syslog was a heading-2, but should be heading-3;
changed the headings to heading-4 to match the
"network settings" section.

Also changed "Log driver" to "logging driver" for JSON.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f855d5dde70f1f3e4390e53576a3ca9b5a9db8ba
Component: engine
2015-04-01 01:07:22 +02:00
Wolfgang Powisch 179a6af99a Update networking.md
Signed-off-by: Wolfgang Powisch <powo@powo.priv.at>
Upstream-commit: 6a47c70d60f5ac92b152e1c8ef7fe5b714fe7833
Component: engine
2015-04-01 00:44:41 +02:00
unclejack 4b9b1a6d15 pkg/broadcastwriter: reset after 4 KB w/o stream
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 153f98bad51e2f46cf3853d2da0173bcfb4b687d
Component: engine
2015-04-01 01:26:19 +03:00
Alexander Morozov 03e99ba9b2 Fix panic in integration tests
Closing activationLock only if it's not closed already. This is needed
only because integration tests using docker code directly and doesn't
care about global state.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: c71747571458bf992c729c483c9509e8182d630b
Component: engine
2015-03-31 15:12:15 -07:00
Derek McGowan fc0b67bcbc Use vendored v2 registry api
Update registry package to use the v2 registry api from distribution. Update interfaces to directly take in digests.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 62009ef77efcbe30afea0cd124f3fbff0d5030cd
Component: engine
2015-03-31 15:02:27 -07:00
Alexander Morozov bce31440c3 Skip heavy operations if there is no jsonlog writers
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: d15d1674c318366e881fa4ea2977192750d3471b
Component: engine
2015-04-01 01:02:18 +03:00