Michael Crosby
5d49d2bb7a
Merge pull request #9426 from lhuard1A/overlay_rename
...
Rename overlayfs to overlay
2014-12-03 10:57:42 -08:00
Lénaïc Huard
2352f00e4f
Remove the last references to overlayfs
...
This only renames docker internal structures.
It has no impact on the end-user.
Signed-off-by: Lénaïc Huard <lhuard@amadeus.com >
2014-12-03 14:06:19 +01:00
Lénaïc Huard
d680ca5c96
Rename the overlay storage driver
...
so that docker is started with `docker -d -s overlay` instead of `docker -d -s overlayfs`
Signed-off-by: Lénaïc Huard <lhuard@amadeus.com >
2014-12-03 13:57:23 +01:00
Sven Dowideit
70c4b4eded
Merge pull request #9429 from sindhus/patch-1
...
Fix dead link in oracle.md
2014-12-03 12:38:17 +10:00
Fred Lifton
315520b845
Merge pull request #9430 from sindhus/patch-3
...
Fix dead link cli.md
2014-12-02 16:06:48 -08:00
Michael Crosby
bc7ef42716
Merge pull request #9463 from jlhawn/tarsum_test_fix
...
Fix TarSum iteration test
2014-12-02 15:55:07 -08:00
Josh Hawn
8d9e25dbdd
Fix TarSum iteration test
...
I noticed that 3 of the tarsum test cases had expected a tarsum with
a sha256 hash of
e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
As I've been working with sha256 quite a bit lately, it struck me that
this is the initial digest value for sha256, which means that no data
was processed. However, these tests *do* process data. It turns out that
there was a bug in the test handling code which did not wait for tarsum
to end completely. This patch corrects these test cases.
I'm unaware of anywhere else in the code base where this would be an issue,
though we definitily need to look out in the future to ensure we are
completing tarsum reads (waiting for EOF).
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2014-12-02 15:28:13 -08:00
James Turnbull
1e81a69618
Merge pull request #9460 from shin-/docs_webhooks2
...
Webhooks documentation: additional improvements
2014-12-02 17:42:26 -05:00
James Turnbull
6a98ce2fc0
Merge pull request #9273 from programmerq/dockerimages_hub
...
refer to the registry instead of the hub
2014-12-02 17:15:04 -05:00
Joffrey F
bcef353557
Webhooks documentation: second pass addressing @fredlf's comments
...
Signed-off-by: Joffrey F <joffrey@docker.com >
2014-12-02 13:49:17 -08:00
Jessie Frazelle
906c7211e6
Merge pull request #9457 from icecrime/engine_logf
...
Remove unused Engine.Logf method
2014-12-02 12:17:11 -08:00
Arnaud Porterie
59da197de8
Remove unused Engine.Logf
...
The `Engine.Logf` method was unused and confusing.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2014-12-02 10:47:57 -08:00
Alexander Morozov
50445e4d0c
Merge pull request #9435 from cpuguy83/9414_fix_exec_api_error_no_cmd
...
Check for no `Cmd` on exec create endpoint
2014-12-02 10:28:44 -08:00
Michael Crosby
e40bbf3b9a
Merge pull request #9441 from LK4D4/retry_any_error_on_portmap
...
Try other port on any error from Map
2014-12-02 09:51:50 -08:00
Jeff Anderson
46437d1a60
Update dockerimages.md
...
remove 'public registry'
Signed-off-by: Jeff Anderson <jeff@docker.com >
2014-12-02 10:48:39 -07:00
Michael Crosby
5ec3a038a0
Merge pull request #9442 from icecrime/8658-tls_attach_hangs
...
Fix client-side HTTP hijacking over TLS
2014-12-02 09:47:29 -08:00
Lénaïc Huard
c57317893a
Rename overlayfs to overlay
...
Since Linux 3.18-rc6, overlayfs has been renamed overlay.
This change was introduced by the following commit in linux.git:
ef94b1864d1ed5be54376404bb23d22ed0481feb ovl: rename filesystem type to "overlay"
Signed-off-by: Lénaïc Huard <lhuard@amadeus.com >
2014-12-02 10:02:59 +01:00
Arnaud Porterie
e98e56bb1e
Fix client-side HTTP hijacking over TLS
...
Properly CloseWrite() the client socket once done with stdin when using
TLS connection (this used to rely on an erroneous type assertion).
Fixes #8658 .
Fixes #8642 .
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Signed-off-by: Michael Crosby <crosby.michael@gmail.com >
2014-12-01 18:13:52 -08:00
Sven Dowideit
b487d2f2ff
Merge pull request #9330 from TomasTomecek/master
...
docs: man docker-images: inconsistent naming
2014-12-02 11:42:29 +10:00
James Turnbull
b241571102
Merge pull request #9431 from sindhus/patch-4
...
Fix dead link build.md
2014-12-01 20:29:48 -05:00
Victor Vieux
65e75998af
Merge pull request #9425 from HuKeping/master
...
inspect: format the output of docker inspect
2014-12-01 16:51:47 -08:00
Alexandr Morozov
a00a1a1fca
Try other port on any error from Map
...
Sometimes other programs can bind on ports from our range, so we just
skip this ports on allocation.
Fixes #9293
Probably fixes #8714
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2014-12-01 16:26:30 -08:00
Brian Goff
c8a3d31332
Check for no Cmd on exec create endpoint
...
Fixes #9414
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2014-12-01 17:54:15 -05:00
Jessie Frazelle
bdaf562b4c
Merge pull request #9438 from crosbymichael/label-std-mounts
...
Label std mounts
2014-12-01 14:37:42 -08:00
Michael Crosby
92c840c87d
Merge pull request #9439 from blakery/master
...
Cleanup: remove obsolete workaround
2014-12-01 13:14:47 -08:00
Michael Crosby
305e9cd2fa
Label standard mounts within loop
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-12-01 14:54:14 -05:00
Michael Crosby
42522d29c7
Merge pull request #9407 from hqhq/hq_fix_comments
...
flag: fix the comments
2014-12-01 11:27:06 -08:00
Michael Crosby
2df1365819
Merge pull request #9424 from irachex/pprof_block
...
Attach goroutine blocking profiler
2014-12-01 11:13:05 -08:00
unclejack
8ddb42fbfd
Merge pull request #9378 from LK4D4/change_breakout_detection
...
Change symlink breakout detection logic in archive package
2014-12-01 19:23:18 +02:00
Blake Geno
9200fdd197
remove obsolete workaround
...
Signed-off-by: Blake Geno <blakegeno@gmail.com >
2014-12-01 11:44:13 -05:00
Sindhu S
7754ef1f06
Fix dead link build.md
2014-12-01 19:35:58 +05:30
Sindhu S
b1dc0db56a
Fix dead link cli.md
2014-12-01 19:28:02 +05:30
Sindhu S
ffda2035e5
Fix dead link in oracle.md
2014-12-01 19:07:04 +05:30
Huayi Zhang
51172493ab
Attach goroutine blocking profiler
...
/debug/pprof/block is 404 currently
Signed-off-by: Huayi Zhang <irachex@gmail.com >
2014-12-01 16:46:59 +08:00
HuKeping
921346be48
inspect: format the output of docker inspect
...
Prior to this patch, one would get the output of docker inspect xxx
as below:
user@server:/mnt$ docker inspect ubuntu
[{
"Architecture": "amd64",
...
"VirtualSize": 199257566
}
]user@server:/mnt$
The last ']' was on the same line with the prompt, i wonder if it is
really what we want it be, it is a little weird, so i add a '\n' to it.
Signed-off-by: Hu Keping <hukeping@huawei.com >
2014-12-01 16:28:08 +08:00
James Turnbull
653be15f17
Merge pull request #9421 from nealmcb/9418-registry_api-source-link
...
Fixes #9418 Docker Registry now open source
2014-12-01 01:11:49 -05:00
Neal McBurnett
4bf72613fe
Fixes #9418 Docker Registry now open source
...
Signed-off-by: Neal McBurnett <neal@mcburnett.org >
2014-11-30 21:12:57 -07:00
Sven Dowideit
595cd5279e
Merge pull request #9194 from flavio/update_installation_docs
...
Update installation docs
2014-12-01 13:18:12 +10:00
Sven Dowideit
3fce883a95
Merge pull request #9322 from javawizard/patch-1
...
Correct inaccuracy in docker pull documentation
2014-12-01 12:53:33 +10:00
Flavio Castelli
47d8ec0a42
Cover openSUSE and SUSE Linux Enterprise on the same page
...
Updated the documentation to cover the installation of Docker on
openSUSE and on SUSE Linux Enterprise.
Docker-DCO-1.1-Signed-off-by: Flavio Castelli <fcastelli@suse.com > (github: flavio)
2014-12-01 01:23:38 +01:00
Alexander Boyd
eb8e84c48a
Correct inaccuracy in docker pull documentation
...
Signed-off-by: Alexander Boyd <alex@opengroove.org >
2014-11-29 23:36:19 -07:00
Qiang Huang
9cc73c62e6
flag: fix the comments
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2014-11-30 01:58:16 +08:00
James Turnbull
353ff40181
Merge pull request #9332 from jacobat/patch-1
...
Update documentation for EXPOSE
2014-11-29 09:27:49 -05:00
Jacob Atzen
8432224f0e
Update documentation for EXPOSE
...
The documentation for EXPOSE seems to indicate, that EXPOSE is only relevant in
the context of links, which is not the case.
Signed-off-by: Jacob Atzen <jatzen@gmail.com >
2014-11-29 15:18:18 +01:00
James Turnbull
0675d7bbba
Merge pull request #9335 from jamtur01/typo
...
Removed extraneous )
2014-11-29 02:14:10 -05:00
James Turnbull
5336f44630
Merge pull request #9396 from a-ba/fix-docs-update
...
fixed regression in docs-update.py
2014-11-29 02:12:54 -05:00
James Turnbull
9aad1a7d10
Merge pull request #9321 from shin-/docs_webhooks2
...
Expanded documentation for Webhooks 2.0
2014-11-29 02:11:38 -05:00
Jessie Frazelle
19844140d3
Merge pull request #9400 from emilymaier/9389-fix
...
Fixes race condition in test. Closes #9389 .
2014-11-28 21:02:52 -07:00
Fred Lifton
2c97cc3995
Merge pull request #9227 from SvenDowideit/add-client-ip-to-hosts
...
Add an example of how to add your client IP to the container hosts file
2014-11-28 17:44:11 -08:00
Fred Lifton
11069f257f
Merge pull request #9337 from shishir-a412ed/deprecated-images-t-v
...
Removing description for 'docker images' -t and -v flags, since they are deprecated.
2014-11-28 17:35:36 -08:00