2fa60db4e0
update kernel reqs doc; recommend updates on RHEL
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: b4089114efe23b18218886ec2085455d463c7179
Component: engine
2015-02-10 11:02:05 +10:00
ea5bb62c0a
Merge pull request #10366 from tiborvass/new-pr-workflow
...
New pull request review workflow
Upstream-commit: d21ecf94fea1b715e5237a2b613074af95e58943
Component: engine
2015-02-09 17:33:37 -05:00
6de4570d3e
Merge pull request #10659 from estesp/fix-dup-bind-mounts-testing
...
Clean up dup. volume test and add API test for the same
Upstream-commit: 765c89791bb32cc992a17ad4d4dc7ae28163666d
Component: engine
2015-02-09 16:04:26 -05:00
c6ec28818e
Merge pull request #10660 from tianon/static_build-tag
...
Update project/make/dynbinary to unset the static_build tag
Upstream-commit: 4c1da911a90949e459a7ed6058b28c619daec40e
Component: engine
2015-02-09 13:02:57 -08:00
12a8539065
Merge pull request #10277 from mleone896/rhinit_dead_pid_file
...
Fixing stale pidfile issue when docker dies abruptly
Upstream-commit: 6da5b88bedf7d14c7efb25ae659cccd8980732a4
Component: engine
2015-02-09 12:19:23 -08:00
71dfbf9d9b
Fixing stale pidfile issue when docker dies abruptly
...
Signed-off-by: Mike Leone <mleone896@gmail.com >
fixing indent
Signed-off-by: Mike Leone <mleone896@gmail.com >
Upstream-commit: 05d04843e6b80f131c07882c882f7e4da018a306
Component: engine
2015-02-09 14:01:12 -05:00
3f6a4b57b6
Merge pull request #10657 from estesp/10655-add-host-err-msg
...
Add more helpful error message for --add-host
Upstream-commit: 62ce5de1c192fa772233146935ebd21a01eccdcb
Component: engine
2015-02-09 10:47:04 -08:00
43629f56fe
Add more helpful error message for -add-host
...
Fixes : #10655
As noted in the issue, bad format was being returned even if the format
was appropriate, but the IP was invalid. This adds a better error
message for when the IP address fails validation.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 1ce9fa1c601cc6f09f9a39df535515aec355e95e
Component: engine
2015-02-09 12:45:50 -05:00
123e8eff11
Clean up dup. volume test and add API test for the same
...
Handles missed comments in PR#10622 and adds an API test to validate
error returned properly for duplicate bind mounts for the same
container target path.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 35d48258384a07affac6f49b89a70dd7ffa60428
Component: engine
2015-02-09 12:33:58 -05:00
4046554f92
Merge pull request #10530 from unclejack/install_sh_ssl_certs
...
project/install.sh: install ca-certificates
Upstream-commit: 918b06f53cf9ebdb899d74dcaa90d0f00d0fe9ec
Component: engine
2015-02-09 09:01:02 -08:00
379cbf8e87
Merge pull request #10443 from jbiel/patch-1
...
mkimage-arch.sh - don't run docker in interactive mode
Upstream-commit: 4b681c401c4e01e4cabdfc5197232272f3e88ba2
Component: engine
2015-02-09 08:45:20 -08:00
75b700c443
Update project/make/dynbinary to unset the static_build tag
...
This allows us to use build tags in the code directly to include/exclude code based on our binary's "staticness".
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 10a28da8fd5e4e7b29864e98965eed5f2fbd6b7c
Component: engine
2015-02-09 09:30:09 -07:00
d0465f42ac
Merge pull request #10651 from HammerOfThor/master
...
docs: fix a typo in registry_mirror.md
Upstream-commit: a98355561d23a6b02d5c8d8c94e6ff54866efabf
Component: engine
2015-02-09 05:05:57 -05:00
5c8d4a0091
Merge pull request #10440 from rhvgoyal/skip-dot-prefix-files
...
devicemapper: Skip the files with prefix "." during device map construct...
Upstream-commit: 67a4f1db103ac726f6e3d1fe388214ba41062b78
Component: engine
2015-02-09 10:26:27 +01:00
ce923ef765
Merge pull request #10624 from stevekochscience/master
...
Add link to user guide to end of 14.04 section
Upstream-commit: c28ea14bbb5c16cd69aee384d5261f6a53581741
Component: engine
2015-02-09 14:05:33 +10:00
a8cd8cc163
docs: fix a typo in registry_mirror.md
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 40486d97098a457bcafd20691ca28648f373a0dc
Component: engine
2015-02-09 10:04:55 +08:00
f77ee21d7f
Merge pull request #10635 from chenhanxiao/docs-Dockerfile-typo
...
docs: fix a typo in Dockerfile.5.md
Upstream-commit: a1eb2bebb812e22c05eeec057b63810b14f6a563
Component: engine
2015-02-09 09:50:18 +10:00
0e2a2c3c6c
Merge pull request #10529 from waitingkuo/patch-2
...
Update certificates.md
Upstream-commit: c61e97c728e551efbdad6f81eb0118da4269fa88
Component: engine
2015-02-08 12:46:22 -08:00
9851ff3c8f
Update certificates.md
...
`openssl req -new -x509 -text -key client.key -out client.cert` creates a self-sign certificate but not a certificate request.
Signed-off-by: Wei-Ting Kuo <waitingkuo0527@gmail.com >
Upstream-commit: 2f69da2a5ef77966a057ff139d442e9f14ca7083
Component: engine
2015-02-09 04:36:00 +08:00
18202afe1d
Move daemon-only flags into the daemon config struct
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
Upstream-commit: 06ea5fe979f39645fe0bcac4c830f4ccb7a7b6ae
Component: engine
2015-02-08 12:56:18 +00:00
31dee84599
Merge pull request #10607 from chenhanxiao/enable-upper-proto
...
nat: enable upper case proto
Upstream-commit: f208201375278e0e572d2a7f5a57e5c8b2ee1e4b
Component: engine
2015-02-07 16:56:35 -08:00
417c803e58
docker_cli_build_test: add testcase of EXPOSE 5678/UDP
...
test whether we could use upper case proto in EXPOSE
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
Upstream-commit: 0552f1a0caf8f8e57736d05c2ed42f82e97df5f6
Component: engine
2015-02-08 07:04:22 +08:00
0eb30d2c37
Merge pull request #10623 from jfrazelle/update-fish
...
Update docker.fish
Upstream-commit: 7b7c8f587b81eee4733685cc11ad4b40f196d2d3
Component: engine
2015-02-07 12:37:21 -05:00
4f7caf8a2c
Fixed one small typo of docker_cli_build_test.go
...
Signed-off-by: André Martins <martins@noironetworks.com >
Upstream-commit: ab4bc988bcf2aae34c27be7e91d86a4c63a1af8d
Component: engine
2015-02-07 15:37:58 +00:00
2fcf439ff5
docs: fix a typo in Dockerfile.5.md
...
s/Mutliple/Multiple
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
Upstream-commit: c4340de04faec1b9d54da62a8a2174da4d6a301b
Component: engine
2015-02-07 17:09:20 +08:00
d863024730
Minor nits
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 30cd215b86337526ce1a7431d8fe4c0f66b5cfff
Component: engine
2015-02-06 22:39:31 -05:00
ffcc4076f8
Merge pull request #10594 from dmcgowan/v2-registry-tarsum-errors
...
Update verification message logic
Upstream-commit: c03d6f57b6956f305a9afcbdc530a15bbe729fce
Component: engine
2015-02-06 17:01:34 -08:00
d6536422f4
Merge pull request #10112 from cpuguy83/4393_fix_volume_where_file_exists
...
Error out if file in container at volume path
Upstream-commit: b0ed2da4418d62d2d7b940b49e0e89bdcd264569
Component: engine
2015-02-06 19:39:48 -05:00
51fc1df02c
Merge pull request #10320 from shishir-a412ed/cleanup_cmd_tag
...
cleanup of docker tag command code
Upstream-commit: 81f74caee8f9f2fed7d9d47bea74b04a06875477
Component: engine
2015-02-06 16:34:48 -08:00
3bd03f7627
Merge pull request #10534 from unclejack/aufs_enable_dio
...
daemon/graphdriver/aufs: enable direct io
Upstream-commit: 414a37f90aa7f01a29e4abdf04b73bb46c896e18
Component: engine
2015-02-06 18:26:09 -05:00
6199c38a14
Merge pull request #10548 from SvenDowideit/add-webhook-image-list
...
The Hub build webhooks now list the images that have been built
Upstream-commit: 3807bd97777923cda57879d88e5779fe616191d2
Component: engine
2015-02-06 15:15:16 -08:00
b781d30f81
Merge pull request #10578 from SvenDowideit/copy-edit-10516-fedora-install
...
Copy edit 10516 fedora install
Upstream-commit: dfa1a8493788e3d72eadcd11c221d05306fe9dd0
Component: engine
2015-02-06 15:14:31 -08:00
d10ffd08ef
Merge pull request #10546 from SvenDowideit/update-boolean-flags-help
...
Documentation on boolean flags is wrong #10517
Upstream-commit: e706be77a46b11ed2202e226b10f547aa85a8a85
Component: engine
2015-02-06 15:12:11 -08:00
a6d778b8d7
Update docker.fish
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com > (github: jfrazelle)
Signed-off-by: Coenraad Loubser <coenraad@wish.org.za >
Upstream-commit: 2471134ae38cf5a3743dc530ea746fb2ee42a107
Component: engine
2015-02-06 15:07:42 -08:00
df52d83f51
Merge pull request #10622 from estesp/10618-err-ondup-bind-vols
...
Don't allow duplicate `-v` specifications for the same target
Upstream-commit: 271a073a04cdffbeda5f83d2d227c5e8c5f8ae86
Component: engine
2015-02-06 15:03:56 -08:00
a3cae1498c
Error out if file in container at volume path
...
Fixes #4393
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: c73e3bf4dc0382cd188db3e51c52eaf8bf605795
Component: engine
2015-02-06 18:00:00 -05:00
acc900171e
Merge pull request #10421 from noironetworks/10388-Specifying_confliting_options
...
Specifying -a and -d to docker run should throw an error
Upstream-commit: eb79acd7a0db494d9c6d1b1e970bdabf7c44ae4e
Component: engine
2015-02-06 14:58:08 -08:00
87475d58c1
Merge pull request #10556 from estesp/ipv6-extra-hosts
...
Allow IPv6 addresses in ExtraHosts option settings
Upstream-commit: 76bf543fea18138a17a2a373aaed88bef68f69f7
Component: engine
2015-02-06 14:53:54 -08:00
35392998b3
Merge pull request #10558 from gierschv/doc-remote-url
...
Documents build API "remote" parameter
Upstream-commit: c2f82bba0a7d365ae4712804d9aed50dff788898
Component: engine
2015-02-06 14:51:51 -08:00
ae96fd855d
Merge pull request #10308 from cpuguy83/add_volume_unit_tests
...
Adds unit tests for volumes
Upstream-commit: e4d711f3f02635a02152125848c722a12ec401eb
Component: engine
2015-02-06 14:51:11 -08:00
72669b3feb
Add link to user guide to end of 14.04 section
...
Adding instructions to exit the test shell and a link to the user guide (as is done in the following sections for 12.04 and 13.04/10
Signed-off-by: Steven Koch <sjkoch@unm.edu >
Upstream-commit: 823cb1281060981a537b4d36315bf0a02074b2a2
Component: engine
2015-02-06 15:50:51 -07:00
4c675886ca
Merge pull request #10273 from kojiromike/patch-1
...
Distinguish ENV from setting environment inline
Upstream-commit: 7d4bbc2ed8305a730267e861bfe71ac7dbd3e373
Component: engine
2015-02-06 14:42:02 -08:00
079f594f83
Merge pull request #10573 from LK4D4/return_attach_to_builder
...
Change verbose builder out back to attach
Upstream-commit: e345fe53ba1e8f84cef2396e332860a87fcd65da
Component: engine
2015-02-06 14:37:09 -08:00
440786c4fd
Merge pull request #10424 from LK4D4/fix_non_tailed_log_format
...
Fix logs, so now, old and followed logs has same format without []
Upstream-commit: e4a49ae1885a7f80e713d1d1fc852f6e4214dfe6
Component: engine
2015-02-06 14:35:45 -08:00
2793f9f606
Merge pull request #10105 from LK4D4/remove_tons_of_names
...
Use graphdb.Walk with depth=1 in /containers
Upstream-commit: 9d140fe693a221cd19857c1232da66c52df51c9b
Component: engine
2015-02-06 14:33:26 -08:00
01d71dc709
Merge pull request #10153 from acbodine/api_websocket_test
...
Adds test for api attach via websocket
Upstream-commit: b6dc430d995acd34958c2b1b7becd2e0f473c5a7
Component: engine
2015-02-06 14:29:54 -08:00
10fe3fe6e5
Merge pull request #10215 from taohu/remove-assumption-first-ip-is-bridge-ip
...
Remove the assumption that the first IP is the bridge IP
Upstream-commit: ffc499dbabdef0cdfeb5e71b96b445efa6f12c2e
Component: engine
2015-02-06 14:15:46 -08:00
a251ace79f
Merge pull request #10208 from mota/fix-env-writerto
...
Fix env.WriteTo count return
Upstream-commit: 6d65fa1faa4770b5e7930da8f9e8bd82be539475
Component: engine
2015-02-06 14:14:16 -08:00
de53eceaad
Merge pull request #10186 from rhatdan/selinux-build
...
Turn on Security opts including labeling for docker build
Upstream-commit: 6efecb7b41d1c80e98131307ae428a2f1f57d1ea
Component: engine
2015-02-06 14:11:21 -08:00
2d864c1626
Fix example about ps and linked containers
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 0f8f04a77492ddf37ca9c163ef0c3ddaf8a93a40
Component: engine
2015-02-06 14:05:08 -08:00
