toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,864 Commits 3 Branches 295 Tags
b775e7f418b00f38ee41152dcd22c760cb96febc
Commit Graph
11864 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby b775e7f418 Merge pull request #9441 from LK4D4/retry_any_error_on_portmap 
Try other port on any error from Map
Upstream-commit: e40bbf3b9a408b3e51e837ca1828237f860011b9
Component: engine
 2014-12-02 09:51:50 -08:00
Michael Crosby 958b540000 Merge pull request #9442 from icecrime/8658-tls_attach_hangs 
Fix client-side HTTP hijacking over TLS
Upstream-commit: 5ec3a038a05116e3b3983d3271ada74408fee0e3
Component: engine
 2014-12-02 09:47:29 -08:00
Arnaud Porterie c0a5d7486b 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>
Upstream-commit: e98e56bb1edc3835bc835c9e034780845c64d797
Component: engine
 2014-12-01 18:13:52 -08:00
Sven Dowideit 3e14694b93 Merge pull request #9330 from TomasTomecek/master 
docs: man docker-images: inconsistent naming
Upstream-commit: b487d2f2ff9562301c1e9a1e705876ff3e3f3c10
Component: engine
 2014-12-02 11:42:29 +10:00
James Turnbull bf624ce4b1 Merge pull request #9431 from sindhus/patch-4 
Fix dead link build.md
Upstream-commit: b241571102f245a8d526620598930fc53c126070
Component: engine
 2014-12-01 20:29:48 -05:00
Victor Vieux 70cf9e5532 Merge pull request #9425 from HuKeping/master 
inspect: format the output of docker inspect
Upstream-commit: 65e75998afc53eacdac8784434dd1a7baa92be70
Component: engine
 2014-12-01 16:51:47 -08:00
Alexandr Morozov 9254581bd3 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>
Upstream-commit: a00a1a1fca020d21cb677439160e018bda5c3835
Component: engine
 2014-12-01 16:26:30 -08:00
Jessie Frazelle d061fa172b Merge pull request #9438 from crosbymichael/label-std-mounts 
Label std mounts
Upstream-commit: bdaf562b4c23feda1f8e790ad456d9bbf982e0af
Component: engine
 2014-12-01 14:37:42 -08:00
Michael Crosby 8eef20faf0 Merge pull request #9439 from blakery/master 
Cleanup: remove obsolete workaround
Upstream-commit: 92c840c87de759411229e3d1ace9f8a41cba83dc
Component: engine
 2014-12-01 13:14:47 -08:00
Michael Crosby e178f59d16 Label standard mounts within loop 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 305e9cd2fab974c38064a1acd2ef1f552a3a1357
Component: engine
 2014-12-01 14:54:14 -05:00
Michael Crosby e1900eef38 Merge pull request #9407 from hqhq/hq_fix_comments 
flag: fix the comments
Upstream-commit: 42522d29c7351d960e2346f1e19e0ac6f7ce7ad5
Component: engine
 2014-12-01 11:27:06 -08:00
Michael Crosby 667cbd6ea9 Merge pull request #9424 from irachex/pprof_block 
Attach goroutine blocking profiler
Upstream-commit: 2df1365819c061936efb0b3d1afa3cc623216d64
Component: engine
 2014-12-01 11:13:05 -08:00
unclejack 539a7bfbcc Merge pull request #9378 from LK4D4/change_breakout_detection 
Change symlink breakout detection logic in archive package
Upstream-commit: 8ddb42fbfd692a9888c1e8e9ebacefed62e123ef
Component: engine
 2014-12-01 19:23:18 +02:00
Blake Geno 9bbfd296f7 remove obsolete workaround 
Signed-off-by: Blake Geno <blakegeno@gmail.com>
Upstream-commit: 9200fdd197f7c80c495597104928596516b36f41
Component: engine
 2014-12-01 11:44:13 -05:00
Sindhu S 8985d88694 Fix dead link build.md 
Upstream-commit: 7754ef1f064be08419bf397e2ea7e4ce99bdf90d
Component: engine
 2014-12-01 19:35:58 +05:30
Huayi Zhang cc225fbb9e Attach goroutine blocking profiler 
/debug/pprof/block is 404 currently

Signed-off-by: Huayi Zhang <irachex@gmail.com>
Upstream-commit: 51172493ab6d2b31760b9fe273c7d4d0917a9bb7
Component: engine
 2014-12-01 16:46:59 +08:00
HuKeping a5fafedf3b 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>
Upstream-commit: 921346be48d20a66b2b5763144b064395285bb32
Component: engine
 2014-12-01 16:28:08 +08:00
James Turnbull 9fbeae3448 Merge pull request #9421 from nealmcb/9418-registry_api-source-link 
Fixes #9418 Docker Registry now open source
Upstream-commit: 653be15f176fc64a442bc68e67dda89d4b14008c
Component: engine
 2014-12-01 01:11:49 -05:00
Neal McBurnett 65d8f4630e Fixes #9418 Docker Registry now open source 
Signed-off-by: Neal McBurnett <neal@mcburnett.org>
Upstream-commit: 4bf72613fed9424356e2146d795ddbfa825befa4
Component: engine
 2014-11-30 21:12:57 -07:00
Sven Dowideit 0ed56d2477 Merge pull request #9194 from flavio/update_installation_docs 
Update installation docs
Upstream-commit: 595cd5279e90f1225eb015708b3db5e2e8766c0f
Component: engine
 2014-12-01 13:18:12 +10:00
Sven Dowideit 778a7bdfd3 Merge pull request #9322 from javawizard/patch-1 
Correct inaccuracy in docker pull documentation
Upstream-commit: 3fce883a95b752bce13e84b2470bc9225881d6c5
Component: engine
 2014-12-01 12:53:33 +10:00
Flavio Castelli 7ad93db024 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)
Upstream-commit: 47d8ec0a42ce2cd71a0275665f2e7d74a5a56cbf
Component: engine
 2014-12-01 01:23:38 +01:00
Alexander Boyd 50bc44d6da Correct inaccuracy in docker pull documentation 
Signed-off-by: Alexander Boyd <alex@opengroove.org>
Upstream-commit: eb8e84c48a8a20895b78299dbc2d8429d092be8d
Component: engine
 2014-11-29 23:36:19 -07:00
Qiang Huang 86e291ef5c flag: fix the comments 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 9cc73c62e6779bf2c8eefc4192c017a2c73daf40
Component: engine
 2014-11-30 01:58:16 +08:00
James Turnbull b86446758b Merge pull request #9332 from jacobat/patch-1 
Update documentation for EXPOSE
Upstream-commit: 353ff40181276a0278b323e569cc887d0510ae69
Component: engine
 2014-11-29 09:27:49 -05:00
Jacob Atzen af8a86ae0c 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>
Upstream-commit: 8432224f0ef628b3da42def046e48f9635aa4b23
Component: engine
 2014-11-29 15:18:18 +01:00
James Turnbull f423709e4f Merge pull request #9335 from jamtur01/typo 
Removed extraneous )
Upstream-commit: 0675d7bbbad9097534fa686ca12da967d8ebc9ad
Component: engine
 2014-11-29 02:14:10 -05:00
James Turnbull 2860ecd2f7 Merge pull request #9396 from a-ba/fix-docs-update 
fixed regression in docs-update.py
Upstream-commit: 5336f4463030798aca14d6b685068138b298d521
Component: engine
 2014-11-29 02:12:54 -05:00
James Turnbull 8414f519d4 Merge pull request #9321 from shin-/docs_webhooks2 
Expanded documentation for Webhooks 2.0
Upstream-commit: 9aad1a7d10837f50eb7ff5ecf42bda7279fe889f
Component: engine
 2014-11-29 02:11:38 -05:00
Jessie Frazelle 3c9757aaf8 Merge pull request #9400 from emilymaier/9389-fix 
Fixes race condition in test. Closes #9389.
Upstream-commit: 19844140d338bae8cc56ab0f3318a613859581ea
Component: engine
 2014-11-28 21:02:52 -07:00
Fred Lifton ce7b0568fe 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
Upstream-commit: 2c97cc39958ab9e4d1432836a9e925dd03e87fad
Component: engine
 2014-11-28 17:44:11 -08:00
Fred Lifton d9b29f9a8d Merge pull request #9337 from shishir-a412ed/deprecated-images-t-v 
Removing description for 'docker images' -t and -v flags, since they are deprecated.
Upstream-commit: 11069f257f8169c1774e025fe9ffd6447dd1b900
Component: engine
 2014-11-28 17:35:36 -08:00
Fred Lifton 2237d8acc8 Merge pull request #9347 from SvenDowideit/extract-systemd-docs 
Extract the systemd docs from various places and add a little more
Upstream-commit: 6a4d4fb2f5f93b37d99f66f8190fe89cf2ad5f89
Component: engine
 2014-11-28 17:12:00 -08:00
Emily Maier 154f28d3d7 Fixes race condition in test. Closes #9389. 
Signed-off-by: Emily Maier <emily@emilymaier.net>
Upstream-commit: 9c5e61c24c490ca3e9d52855ee26d4a8e9032fb2
Component: engine
 2014-11-28 13:48:50 -05:00
Alexandr Morozov b86ab101dc Change path breakout detection logic in archive package 
Fixes #9375

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: be5bfbe2217905ba129588fe17264b96c866e26d
Component: engine
 2014-11-28 09:44:47 -08:00
Anthony Baire 647ad41bc0 fixed regression in docs-update.py 
17500eb renamed 'help' as 'help_string', but there was a miss


Signed-off-by: Anthony Baire <Anthony.Baire@irisa.fr>
Upstream-commit: 9f8c14026ce2ddf0f69eb7a416cfb56da5443032
Component: engine
 2014-11-28 13:36:27 +01:00
Tomas Tomecek f8672e482a docs: man docker-images: inconsistent naming 
Synopsis is mentioning "NAME" while description is describing "REPOSITORY".

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
Upstream-commit: 095027944f16205c1c75d47d2f60a7c1ac666bf1
Component: engine
 2014-11-28 08:57:07 +01:00
James Turnbull 5d5bf9faad Merge pull request #9285 from therealprologic/update-crux-docs 
Updated installation docs for CRUX as a Docker Host.
Upstream-commit: 4083fa26208fe4a1b78cad9ab85cdbb50293cedd
Component: engine
 2014-11-27 02:36:05 -05:00
Sven Dowideit bb2a1e68cf Add an example of how to add your client IP to the container hosts file 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 54050083d1c65d4e7a90371c78c587819df27d2f
Component: engine
 2014-11-27 16:36:55 +10:00
James Turnbull 6915edc6f0 Merge pull request #9329 from acbodine/9296-dockervolume-doc-mount-behaviour-fix 
Closes #9296 adds a more detailed note about the mount behavior with -v ...
Upstream-commit: 07e9ea86ca45313018eb1bc8c959ae17867fabb1
Component: engine
 2014-11-27 00:22:19 -05:00
James Turnbull ffe0d333fd Merge pull request #9359 from bfirsh/update-note-format-in-docs-style-guide 
Update format of notes in docs style guide
Upstream-commit: d3707a94114288344bede715989e5221ff6e0a8f
Component: engine
 2014-11-26 22:39:31 -05:00
James Turnbull ceb1c8dfdb Merge pull request #9368 from msteinert/builder-md-typo 
Fix a small typo
Upstream-commit: 9e56c614a160957fa7cd2da91b45780bb3dbaf45
Component: engine
 2014-11-26 22:39:19 -05:00
Sven Dowideit 8ca77e6e26 Merge pull request #9282 from SvenDowideit/explain-VIRTUAL-SIZE 
Explain what the VIRTUAL SIZE means
Upstream-commit: ff327f9d576fea42713e88a6a50ef2a3f47d219f
Component: engine
 2014-11-27 12:19:09 +10:00
Sven Dowideit 1d30429df6 Explain what the VIRTUAL SIZE means 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 498f208ade18dffb7362adc37c1f11b1bff187da
Component: engine
 2014-11-27 12:06:40 +10:00
Fred Lifton a849101a28 Merge pull request #9275 from jfriedly/userguide-typos 
Fix typos in the user guide main page
Upstream-commit: ec07bb48fc819e741775d9440be69b7679eae5ae
Component: engine
 2014-11-26 17:03:59 -08:00
Sven Dowideit be6e29bd97 Extract the systemd docs from various places and add a little more 
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
Upstream-commit: d53b586ff1b274b529b7912df3052a1bc2ca8dfe
Component: engine
 2014-11-27 10:17:46 +10:00
Alexander Morozov ca3f79cbd3 Merge pull request #9366 from yoheiueda/increase-memory-limit 
Increase memory limit in integration-cli test cases
Upstream-commit: 9974fce28a6aea81f8ea8c43a782d9940822d724
Component: engine
 2014-11-26 12:09:39 -08:00
Jessie Frazelle b1dc744a56 Merge pull request #9367 from jfrazelle/no-windows-for-you-yet 
Windows should not be in "official release" yet
Upstream-commit: 6d171c5340adf3f311c830d8900f75741521bbe9
Component: engine
 2014-11-26 11:59:21 -08:00
Jessica Frazelle bc16e560f9 Windows should not be officially released. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 750dc335a983fcd2c1410bffe5e23d1b0b3c3e3c
Component: engine
 2014-11-26 11:50:07 -08:00
Vincent Batts 7b6399d928 Merge pull request #9006 from snitm/thin-pool-improvements 
Thin pool improvements
Upstream-commit: b47ff77b5ce852bd830bc617d1c4e2c37e346281
Component: engine
 2014-11-26 14:44:09 -05:00