Tibor Vass
aadb6289cc
Remove word "fail" from tests
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-02-09 18:01:52 -05:00
Tibor Vass
d21ecf94fe
Merge pull request #10366 from tiborvass/new-pr-workflow
...
New pull request review workflow
2015-02-09 17:33:37 -05:00
Tibor Vass
765c89791b
Merge pull request #10659 from estesp/fix-dup-bind-mounts-testing
...
Clean up dup. volume test and add API test for the same
2015-02-09 16:04:26 -05:00
Jessie Frazelle
4c1da911a9
Merge pull request #10660 from tianon/static_build-tag
...
Update project/make/dynbinary to unset the static_build tag
2015-02-09 13:02:57 -08:00
Tianon Gravi
6da5b88bed
Merge pull request #10277 from mleone896/rhinit_dead_pid_file
...
Fixing stale pidfile issue when docker dies abruptly
2015-02-09 12:19:23 -08:00
Mike Leone
05d04843e6
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>
2015-02-09 14:01:12 -05:00
Alexander Morozov
62ce5de1c1
Merge pull request #10657 from estesp/10655-add-host-err-msg
...
Add more helpful error message for --add-host
2015-02-09 10:47:04 -08:00
Phil Estes
1ce9fa1c60
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)
2015-02-09 12:45:50 -05:00
Phil Estes
35d4825838
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)
2015-02-09 12:33:58 -05:00
Tianon Gravi
918b06f53c
Merge pull request #10530 from unclejack/install_sh_ssl_certs
...
project/install.sh: install ca-certificates
2015-02-09 09:01:02 -08:00
Tianon Gravi
4b681c401c
Merge pull request #10443 from jbiel/patch-1
...
mkimage-arch.sh - don't run docker in interactive mode
2015-02-09 08:45:20 -08:00
Tianon Gravi
10a28da8fd
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>
2015-02-09 09:30:09 -07:00
James Turnbull
a98355561d
Merge pull request #10651 from HammerOfThor/master
...
docs: fix a typo in registry_mirror.md
2015-02-09 05:05:57 -05:00
Vincent Batts
67a4f1db10
Merge pull request #10440 from rhvgoyal/skip-dot-prefix-files
...
devicemapper: Skip the files with prefix "." during device map construct...
2015-02-09 10:26:27 +01:00
Sven Dowideit
c28ea14bbb
Merge pull request #10624 from stevekochscience/master
...
Add link to user guide to end of 14.04 section
2015-02-09 14:05:33 +10:00
Zhang Wei
40486d9709
docs: fix a typo in registry_mirror.md
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-02-09 10:04:55 +08:00
Sven Dowideit
a1eb2bebb8
Merge pull request #10635 from chenhanxiao/docs-Dockerfile-typo
...
docs: fix a typo in Dockerfile.5.md
2015-02-09 09:50:18 +10:00
Jessie Frazelle
c61e97c728
Merge pull request #10529 from waitingkuo/patch-2
...
Update certificates.md
2015-02-08 12:46:22 -08:00
Jessie Frazelle
04b0bf4c27
Merge pull request #10453 from aidanhs/aphs-move-daemon-flags
...
Move daemon-only flags into the daemon config struct
2015-02-08 12:40:19 -08:00
Wei-Ting Kuo
2f69da2a5e
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>
2015-02-09 04:36:00 +08:00
Aidan Hobson Sayers
06ea5fe979
Move daemon-only flags into the daemon config struct
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2015-02-08 12:56:18 +00:00
Alexander Morozov
f208201375
Merge pull request #10607 from chenhanxiao/enable-upper-proto
...
nat: enable upper case proto
2015-02-07 16:56:35 -08:00
Chen Hanxiao
0552f1a0ca
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>
2015-02-08 07:04:22 +08:00
Tibor Vass
7b7c8f587b
Merge pull request #10623 from jfrazelle/update-fish
...
Update docker.fish
2015-02-07 12:37:21 -05:00
Tibor Vass
1da2a53a24
Merge pull request #10533 from noironetworks/Fixes-one-failing-test
...
Fixed one test that was causing error
2015-02-07 12:12:03 -05:00
André Martins
ab4bc988bc
Fixed one small typo of docker_cli_build_test.go
...
Signed-off-by: André Martins <martins@noironetworks.com>
2015-02-07 15:37:58 +00:00
Chen Hanxiao
c4340de04f
docs: fix a typo in Dockerfile.5.md
...
s/Mutliple/Multiple
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
2015-02-07 17:09:20 +08:00
Tibor Vass
30cd215b86
Minor nits
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-02-06 22:39:31 -05:00
Arnaud Porterie
c03d6f57b6
Merge pull request #10594 from dmcgowan/v2-registry-tarsum-errors
...
Update verification message logic
2015-02-06 17:01:34 -08:00
Tibor Vass
b0ed2da441
Merge pull request #10112 from cpuguy83/4393_fix_volume_where_file_exists
...
Error out if file in container at volume path
2015-02-06 19:39:48 -05:00
Jessie Frazelle
81f74caee8
Merge pull request #10320 from shishir-a412ed/cleanup_cmd_tag
...
cleanup of docker tag command code
2015-02-06 16:34:48 -08:00
Tibor Vass
414a37f90a
Merge pull request #10534 from unclejack/aufs_enable_dio
...
daemon/graphdriver/aufs: enable direct io
2015-02-06 18:26:09 -05:00
Michael Crosby
3807bd9777
Merge pull request #10548 from SvenDowideit/add-webhook-image-list
...
The Hub build webhooks now list the images that have been built
2015-02-06 15:15:16 -08:00
Michael Crosby
dfa1a84937
Merge pull request #10578 from SvenDowideit/copy-edit-10516-fedora-install
...
Copy edit 10516 fedora install
2015-02-06 15:14:31 -08:00
Jessie Frazelle
e706be77a4
Merge pull request #10546 from SvenDowideit/update-boolean-flags-help
...
Documentation on boolean flags is wrong #10517
2015-02-06 15:12:11 -08:00
Coenraad Loubser
2471134ae3
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>
2015-02-06 15:07:42 -08:00
Jessie Frazelle
271a073a04
Merge pull request #10622 from estesp/10618-err-ondup-bind-vols
...
Don't allow duplicate `-v` specifications for the same target
2015-02-06 15:03:56 -08:00
Brian Goff
c73e3bf4dc
Error out if file in container at volume path
...
Fixes #4393
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-02-06 18:00:00 -05:00
Michael Crosby
eb79acd7a0
Merge pull request #10421 from noironetworks/10388-Specifying_confliting_options
...
Specifying -a and -d to docker run should throw an error
2015-02-06 14:58:08 -08:00
Jessie Frazelle
76bf543fea
Merge pull request #10556 from estesp/ipv6-extra-hosts
...
Allow IPv6 addresses in ExtraHosts option settings
2015-02-06 14:53:54 -08:00
Jessie Frazelle
c2f82bba0a
Merge pull request #10558 from gierschv/doc-remote-url
...
Documents build API "remote" parameter
2015-02-06 14:51:51 -08:00
Alexander Morozov
e4d711f3f0
Merge pull request #10308 from cpuguy83/add_volume_unit_tests
...
Adds unit tests for volumes
2015-02-06 14:51:11 -08:00
Steve Koch
823cb12810
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>
2015-02-06 15:50:51 -07:00
Michael Crosby
7d4bbc2ed8
Merge pull request #10273 from kojiromike/patch-1
...
Distinguish ENV from setting environment inline
2015-02-06 14:42:02 -08:00
Michael Crosby
e345fe53ba
Merge pull request #10573 from LK4D4/return_attach_to_builder
...
Change verbose builder out back to attach
2015-02-06 14:37:09 -08:00
Michael Crosby
e4a49ae188
Merge pull request #10424 from LK4D4/fix_non_tailed_log_format
...
Fix logs, so now, old and followed logs has same format without []
2015-02-06 14:35:45 -08:00
Michael Crosby
9d140fe693
Merge pull request #10105 from LK4D4/remove_tons_of_names
...
Use graphdb.Walk with depth=1 in /containers
2015-02-06 14:33:26 -08:00
Alexander Morozov
b6dc430d99
Merge pull request #10153 from acbodine/api_websocket_test
...
Adds test for api attach via websocket
2015-02-06 14:29:54 -08:00
Michael Crosby
ffc499dbab
Merge pull request #10215 from taohu/remove-assumption-first-ip-is-bridge-ip
...
Remove the assumption that the first IP is the bridge IP
2015-02-06 14:15:46 -08:00
Alexander Morozov
6d65fa1faa
Merge pull request #10208 from mota/fix-env-writerto
...
Fix env.WriteTo count return
2015-02-06 14:14:16 -08:00