106678e894
Do not use HTTP_PROXY for unix sock
...
Makes sure the CLI does not use HTTP_PROXY when connecting to unix
socket.
Also adds some tests to make sure this functionality works as expected.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: f6e697d2ace2ea659c1b3f7e3dcef7493baa481c
Component: engine
2015-02-12 11:38:52 -05:00
ebb652c696
Merge pull request #10686 from LK4D4/bump_docs
...
Bump api version to 1.18
Upstream-commit: f4749acad48f03454c951081a0a3f0149a23e260
Component: engine
2015-02-11 11:01:28 -08:00
c13ff18007
Merge pull request #10670 from tianon/revert-10290-sorry-windows-norelease4u
...
Revert "Remove windows from the list of supported platforms"
Upstream-commit: df7a04f9a64fc7b8e528a3b99beb71b97b4b22d0
Component: engine
2015-02-11 13:54:34 -05:00
a2081fdfa4
Merge pull request #10596 from rhvgoyal/manifest-close-archive
...
manifest: Close archive once done to umount the device backing the layer
Upstream-commit: 3e039e8748f9783516183f729f85e26cfe9de9d9
Component: engine
2015-02-11 09:05:26 -08:00
5407924e49
docker-call-close-archive-in-push-v2-image
...
pushV2Image() calls TarLayer() which returns an archive. One needs to
Close() the archive once done otherwise it will leave mounted devices
if devicemapper graph driver is being used.
Signed-off-by: Derek McGowan <derek@mcgstyle.net >
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
Upstream-commit: 064ff42d6d34b9c92e634f30ac1549d9786ab26f
Component: engine
2015-02-11 11:30:46 -05:00
6e39a35c8f
manifest: Close archive once done using it
...
manifest code calls TarLayer() and gets archive. This archive needs to
be closed once caller is done using it to release the resrouces held
by archive. For the devicemapper graphdriver, archive keeps a device
mounted (device which is backing the layer). If archive.Close() is not
called, that device remains mounted and later deletion of device fails
leading to various other issues.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
Upstream-commit: 41bfa87b6c27b3f0041906f99ae9d0d9531db898
Component: engine
2015-02-11 11:30:45 -05:00
552bf3d2e6
Merge pull request #10658 from duglin/ReferenceSpecs
...
Add Image/Libcontainer spec refs to README
Upstream-commit: 9939dbe58bae371ca08ce65610aa8a1f7915b506
Component: engine
2015-02-11 06:42:41 -05:00
2979e456cd
Merge pull request #10632 from chenhanxiao/update-TESTFLAGS-docs
...
docs: emphasis TESTFLAGS and add some descriptions
Upstream-commit: 54b59c2b2f440df0a513a37d7709fc5b0c88773f
Component: engine
2015-02-11 12:36:43 +10:00
8f4f7fbb54
Merge pull request #10687 from icecrime/bump_master_v1.5.0
...
Bump to version v1.5.0-dev
Upstream-commit: 19019722d944ecc17a1a62acc418d74ef4e23407
Component: engine
2015-02-10 14:10:45 -08:00
5b5c1c638d
Merge pull request #10689 from duglin/ScratchImage
...
Show err msg on empty 'scratch' Dockerfile
Upstream-commit: 84fc81e35369e817dbd91bb2a51745f5eaec55e0
Component: engine
2015-02-10 13:54:43 -08:00
b185b43330
Show err msg on empty 'scratch' Dockerfile
...
If you have a Dockefile with just:
FROM scratch
An error is generated but its never shown to the CLI. This PR fixes that.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 1654dfdf146df42a1271696c0290027460cce59a
Component: engine
2015-02-10 11:43:45 -08:00
b05344184c
Bump to version v1.5.0
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 66ab357edf7491179c541ed3cfff21904396e56a
Component: engine
2015-02-10 10:52:36 -08:00
5c56835bc1
Bump api version to 1.18
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: d92b4232f7c7cb64efd8e56c33238b4426fe22af
Component: engine
2015-02-10 10:48:54 -08:00
009380c706
Merge pull request #10474 from petervo/10473-availble-space
...
Add available space to devicemapper status output
Upstream-commit: f4dc496d36d31cf9ca1b3508f10954066ff7f8bc
Component: engine
2015-02-10 16:32:51 +01:00
04be9f6857
docs: emphasis TESTFLAGS and add some descriptions
...
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
Upstream-commit: d83b6918a7d18a09f86858709f173277d62c268e
Component: engine
2015-02-10 15:34:33 +08:00
64a4aefa3d
Merge pull request #10671 from tiborvass/remove-fail-word-from-tests
...
Remove word "fail" from tests
Upstream-commit: d14751bf30a70abe7bc6048af61848eed32ca140
Component: engine
2015-02-09 20:53:15 -08:00
1ebda39c1c
Merge pull request #10561 from duglin/SupportNoArgCmds
...
Add support for no-arg commands in Dockerfile
Upstream-commit: 7cc76a7fda2b039a68aa1e1612474e2c4c0c5821
Component: engine
2015-02-09 18:08:14 -08:00
2dc29a37bd
Merge pull request #10598 from lsm5/core-file-size
...
no limit on core size
Upstream-commit: 9944f8b95453e3d0726fc037aaed41a98e72e070
Component: engine
2015-02-09 17:31:40 -08:00
44b33ef557
Merge pull request #10652 from SvenDowideit/update-9456
...
update kernel reqs doc; recommend updates on RHEL
Upstream-commit: 4284715c79acf1cdc4da1e8af4827b157ed08bb6
Component: engine
2015-02-10 11:02:42 +10:00
48d21d06a2
updates from review
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 32c6179f475183ba778cb90656a971cde81340dc
Component: engine
2015-02-10 11:02:05 +10:00
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
d05965b4df
Merge pull request #10608 from SvenDowideit/wrap-doc-headings-in-sidebar
...
Simplfy the sidebar html and css, and then allow the text to wrap
Upstream-commit: 76baa351c07d7fe847d14fafbcb5a3ba97519a1a
Component: engine
2015-02-10 10:03:37 +10:00
9dcb95789e
remove the text-indent and increase the font size
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 6257505dbc44bb58c56ac92677dbf07548c0c74a
Component: engine
2015-02-10 09:50:02 +10:00
f24997510f
Simplfy the sidebar html and css, and then allow the text to wrap
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: c237f9f201bbf5c4b06fbfd65254eb2af75e136f
Component: engine
2015-02-10 09:50:02 +10:00
e0ebfad813
Remove word "fail" from tests
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: aadb6289ccd84b9997a43c8b74b2948236f30e76
Component: engine
2015-02-09 18:01:52 -05:00
7fe8a53e1c
Detail available space behavior on loop devices
...
Signed-off-by: Peter Volpe <petervo@redhat.com >
Upstream-commit: 6816d27591a24b7a3a5b2e4c85294abffda977a2
Component: engine
2015-02-09 14:51:48 -08: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
47f750ae10
Revert "Remove windows from the list of supported platforms"
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 4bc4587f05a754f52e40928c32c84ea48cc3522f
Component: engine
2015-02-09 15:22:22 -07: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
2989e6a633
no limit on core size
...
set LimitCORE=infinity to ensure complete core creation,
allows extraction of as much information as possible.
Thanks to Ulrich Obergfell <uobergfe@redhat.com >
and Jeremy Eder <jeder@redhat.com >
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org >
Upstream-commit: ae9cdbbde7824951b124a648e897ac4c291108e3
Component: engine
2015-02-09 19:04:50 +00: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
9c2d8bdbe5
Add Image/Libcontainer spec refs to README
...
Right now its really hard for a newbie to find our Image specification
so I'm adding a link to it (and libcontainer's) to the main README.
I'm also trying to figure out how to add a link to it from the main docs
too but that's proving harder than I expected. I'll be working with Sven on
a subsequent PR to make that happen, but it might not happen until after 1.5
is out.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 5c7a947b3c12a7cba52ee7813d483f56cea1b8b7
Component: engine
2015-02-09 06:09:51 -08: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
9c8c717299
Merge pull request #10453 from aidanhs/aphs-move-daemon-flags
...
Move daemon-only flags into the daemon config struct
Upstream-commit: 04b0bf4c27bed6c07f84b5ad5c252917f912f0cd
Component: engine
2015-02-08 12:40:19 -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
4413092410
Get list of Dockerfile cmds from builder so we can be smarted in our tests
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: d1e9d07c1b09a145b881a7ee6d58cc2e860167c8
Component: engine
2015-02-08 08:09:02 -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
Brian Goff
Jessie Frazelle
Tibor Vass
Vivek Goyal
James Turnbull
Sven Dowideit
Michael Crosby
Doug Davis
Arnaud Porterie
Alexander Morozov
Vincent Batts
Chen Hanxiao
Alexander Morozov
Sven Dowideit
unclejack
Tibor Vass
Peter Volpe
Tianon Gravi
Lokesh Mandvekar
Mike Leone
Phil Estes
Zhang Wei
Wei-Ting Kuo
Aidan Hobson Sayers