Michael Crosby
271208f1aa
Merge pull request #9228 from SvenDowideit/update-tlsverify-doc
...
tlsverify flag has no dash
Upstream-commit: c1a40d927999a7e019f1952c2b140ef6e4a76171
Component: engine
2014-11-20 15:19:31 -08:00
Jessica Frazelle
0e1ef24503
Fix tag output where image is not found.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: e527be1f14eda5a3d9077517a0398d85c4d7fac6
Component: engine
2014-11-20 15:09:09 -08:00
Lei Jitang
49be3bdeb0
Fix create container output messages.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Signed-off-by: Jessica Frazelle <jess@docker.com >
Upstream-commit: 7a7890950d59abf7bc4f826c605289e1d7586390
Component: engine
2014-11-20 15:03:27 -08:00
Michael Crosby
0f9991ec4d
Revert "Support hairpin NAT"
...
This reverts commit 95a400e6e1a3b5da68431e64f9902a3fac218360.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 56c37536315d4c63c35b766e3335034e488e2189
Component: engine
2014-11-20 14:22:32 -08:00
Sven Dowideit
17282d5feb
Add an example that shows starting apache in the foreground
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 8d3b13bd7a14aa41eb3d3f3aab1b974af1db4a50
Component: engine
2014-11-20 14:21:05 -08:00
Michael Crosby
b0f41baab2
Merge pull request #9260 from LK4D4/increase_proxy_timeout
...
Increase timeout for userland proxy starting
Upstream-commit: 4acdb7ddc7f10cd707d02ca88317056e988b2abb
Component: engine
2014-11-20 14:20:31 -08:00
Michael Crosby
2a4e189795
Update libcontainer to 84c1636580a356db88b079d118b
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: f42176434aa874afb7d633064f2babcf9d5124ab
Component: engine
2014-11-20 14:19:24 -08:00
Michael Crosby
e22789790c
Merge pull request #9174 from dqminh/docker-exec-env
...
Set correct env variables for `docker exec` commands
Upstream-commit: 9a917e732c8f84f365b36a5a92bdb1f546a7e4d1
Component: engine
2014-11-20 13:31:51 -08:00
Michael Crosby
f435c304cd
Merge pull request #8251 from duglin/Issue2333
...
Add support for ENV of the form: ENV name=value ...
Upstream-commit: 58b6f31a7a3157b5ece418da0a976a28dae9841d
Component: engine
2014-11-20 13:12:24 -08:00
Victor Vieux
a8399407af
docs nits
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 284cbda9ceb368d4bb67c0c75739984622570d92
Component: engine
2014-11-20 19:54:03 +00:00
Victor Vieux
f6afb58177
events filtering
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 7ff3b81054b028a4399c86340489fe3937049abe
Component: engine
2014-11-20 19:46:48 +00:00
Victor Vieux
35fec2c425
add daemon labels
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 2fe36baa0a39840e64f1dc585af41b5ee0ed6df5
Component: engine
2014-11-20 19:23:58 +00:00
Tibor Vass
fa056c1bc9
Merge pull request #9201 from vieux/add_hostname_docker_info
...
Add hostname and ID docker info
Upstream-commit: 998b591a71094b3f0112dac9b0c35a93745ac28f
Component: engine
2014-11-20 13:11:16 -05:00
Daniel, Dao Quang Minh
9a648e0fc7
test case for preserving env in exec session
...
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com > (github: dqminh)
Upstream-commit: 2bceaae42399ce33e8c724d1ac435eca6759637b
Component: engine
2014-11-20 13:05:37 -05:00
Dan Walsh
6ebbd4b25f
Allow developers to build docker with debuginfo included
...
If you execute
DEBUG=-g hack/make.sh dynbinary
Docker will be build with the debug info making it easier to use
cgdb or lightide to debug.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: bce9ed0e4c56b85c8a4a5ba2b1af45035deec9dd
Component: engine
2014-11-20 12:59:50 -05:00
Doug Davis
5dafd01fe8
Add support for ENV of the form: ENV name=value ...
...
still supports the old form: ENV name value
Also, fixed an issue with the parser where it would ignore lines
at the end of the Dockerfile that ended with \
Closes #2333
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 1314e1586f8cd6201c16161eb960a743c727946b
Component: engine
2014-11-20 09:54:28 -08:00
Victor Vieux
7a40da10bf
update docs
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 8ef36dcfe75752a5705813e2d9fa9359a8162b18
Component: engine
2014-11-20 17:40:08 +00:00
Victor Vieux
addb2d43fa
Hostname -> Name
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 227f4bbdb3a1e9ff0011d1ebaed39b3cb19d9e75
Component: engine
2014-11-20 17:40:08 +00:00
Victor Vieux
4b4f9725e6
Update libtrust version
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 6e92dfdfd843aec909572a405337efb25beb6f58
Component: engine
2014-11-20 17:39:54 +00:00
unclejack
14c4bd0633
integ-cli: fix cleanup in build tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: db7fded17fd984fc3c854d1e34bd8d656c3b3692
Component: engine
2014-11-20 19:38:41 +02:00
unclejack
9ed67f3c2f
integ-cli: fix cleanup in test which mounts tmpfs
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 98307c8faefca5c4347288af18aee4dacbf8802c
Component: engine
2014-11-20 19:37:46 +02:00
unclejack
39f1feb541
pkg/symlink: fix cleanup for tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 4508bd94b0efd07a0ef48cd090786615e6b8cbb7
Component: engine
2014-11-20 19:36:54 +02:00
unclejack
86c00287ea
pkg/archive: fix TempArchive cleanup w/ one read
...
This fixes the removal of TempArchives which can read with only one
read. Such archives weren't getting removed because EOF wasn't being
triggered.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 32ba6ab83c7e47d627a2b971e7f6ca9b56e1be85
Component: engine
2014-11-20 19:34:35 +02:00
unclejack
42efcf2e21
pkg/system: fix cleanup in tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 769b79866aa645d4deeeb0a44120cde7b046f0d1
Component: engine
2014-11-20 19:33:15 +02:00
Alexandr Morozov
a47630e4a6
Increase timeout for userland proxy starting
...
Fixes #8883
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 72c55e82156843c73ab1405b565e63d947b66c10
Component: engine
2014-11-20 09:02:42 -08:00
Arnaud Porterie
f04fedef6e
Allocate daemon listening ports
...
Mark the daemon listening ports as allocated in the portallocator in
order to prevent containers from exposing this port themselves.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 7c225333f22378e380309bd0c3afc1b3311b1373
Component: engine
2014-11-19 23:34:27 -08:00
Oh Jinkyun
313de46eb6
Fix for #8777
...
Now filter name is trimmed and lowercased before evaluation for case
insensitive and whitespace trimemd check.
Signed-off-by: Oh Jinkyun <tintypemolly@gmail.com >
Upstream-commit: 4deac03c65edf34affd66abd3ef8fb88287d2f5a
Component: engine
2014-11-20 13:36:46 +09:00
Michael Crosby
21506f31ee
Merge pull request #9226 from crosbymichael/container-net-test
...
Add test for --net container:<id>
Upstream-commit: 739d917d7094db822ecfe927e1e934c3c8ec4047
Component: engine
2014-11-19 17:57:45 -08:00
Michael Crosby
f35e467fb4
Merge pull request #9211 from mtesselH/login
...
Fixed a bug - no panic anymore when logining in without TTY
Upstream-commit: d4ca9e5cce2ff7e08750123609df1864e0befdcf
Component: engine
2014-11-19 17:52:35 -08:00
Michael Crosby
259b05fa1e
Add test for --net container:<id>
...
This adds an integration test for checking that the network namespace
fds are the same when a container joins another container's network
namespace.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 71209f75791fdc1a2124682f50cd00a413ddb143
Component: engine
2014-11-19 17:43:04 -08:00
Michael Crosby
60406cf97c
Merge pull request #9180 from chenchun/master
...
Clean config path of bind mount volume
Upstream-commit: adc344dfdee7dd006f8855d7af83b00683b5660e
Component: engine
2014-11-19 17:41:46 -08:00
Vincent Batts
41c5b5d8f6
overlayfs: add --storage-driver doc
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: cb57c388480d03770378e6e1842c2c1c6a46d8fd
Component: engine
2014-11-19 19:36:05 -05:00
Sven Dowideit
f169786708
Merge pull request #9191 from duglin/Issue8775
...
Be clearer in docs about COPY/ADD dirs
Upstream-commit: 3e5cb0c84f390c2c939061ae34754e3924f82790
Component: engine
2014-11-19 15:26:20 -08:00
Jessie Frazelle
6e30644aa7
Merge pull request #9251 from tonistiigi/use-format-logging-functions
...
Fix misuses of format based logging functions
Upstream-commit: eb3bbde6d18bb35774cd3ab2c6eba0016f679d2b
Component: engine
2014-11-19 15:25:42 -08:00
Sven Dowideit
e390ce1d8e
Merge pull request #9144 from miminar/sigproxy_tty
...
Corrected description of --sig-proxy
Upstream-commit: c7e6ad8e987d06385894ee8cd77fe2571ca9bb50
Component: engine
2014-11-19 14:52:01 -08:00
Alexander Morozov
ee1e7b75b0
Merge pull request #9249 from tonistiigi/integration-cli-cleanup
...
Make sure integration-cli tests clean up
Upstream-commit: bca63b4f48a48ec3918862a8fc094e949f42038d
Component: engine
2014-11-19 14:27:13 -08:00
Tonis Tiigi
a3eaed6ca5
Fix misuses of format based logging functions
...
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com > (github: tonistiigi)
Upstream-commit: 6705477673be7c303369778f6f288ee600ce3893
Component: engine
2014-11-19 23:59:02 +02:00
Tonis Tiigi
f428978f5b
Fix deleteImages() helper for multiple names
...
Pass every image name as separate argument.
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com > (github: tonistiigi)
Upstream-commit: bbb245defe670f4fd9b9159b154e0ba5aa93ec87
Component: engine
2014-11-19 23:42:16 +02:00
Arnaud Porterie
eb838e9fad
Adapt project/make.sh for Windows builds
...
Fixes:
- link -H windows is not compatible with -linkmode external
- under Cygwin go does not play well with cygdrive type paths
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: ce86d5ae6826b0ec3dcf3188f8a6bd37b0afd3b2
Component: engine
2014-11-19 13:41:57 -08:00
Tonis Tiigi
865600707c
Make sure integration-cli test clean up
...
Common patterns:
- Multiple images were built with same name but only one cleanup.
- Containers were deleted after images.
- Images not removed after retagging.
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com > (github: tonistiigi)
Upstream-commit: da3d3b97ebe1e6fe1254367521c725ca12a5e61d
Component: engine
2014-11-19 23:41:46 +02:00
Josh Hawn
b6be906192
Add unit test for tarSum.Sum() with no data
...
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: e257863a9a2bff19c66355230483a8b6fa9de209
Component: engine
2014-11-19 15:55:21 -05:00
Vincent Batts
3898f51483
pkg/tarsum: actually init the TarSum struct
...
closes #9241
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 6a74f071afb4a69a1360ff1e84945745e578c349
Component: engine
2014-11-19 15:46:03 -05:00
Vincent Batts
e5e6585e2a
issue report script
...
Add a script that will facilitate standard issue reports.
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com >
Upstream-commit: ea5a2c1fd74af1a806c8f4ef7858afe6435d90fa
Component: engine
2014-11-19 12:32:45 -05:00
Michal Minar
a18fff0f61
Updated sig-proxy text also in zsh completion script
...
Signed-off-by: Michal Minar <miminar@redhat.com >
Upstream-commit: 1cd12efb5d0065990334de4f97fa85b317f97f11
Component: engine
2014-11-19 09:09:42 +01:00
Tatsushi Inagaki
bff9ea9dff
Fix to avoid a compile error due to float to int truncation with GCCGO
...
Signed-off-by: Tatsushi Inagaki <e29253@jp.ibm.com >
Upstream-commit: 967a42f116d23051c862a3b4983925de2016f83c
Component: engine
2014-11-19 15:06:49 +09:00
Vincent Batts
2d6b81cf5d
CONTRIBUTING: provide a template for new issues
...
_maybe_ we could even automate this to populate and complain in some
situations.
I see https://github.com/isaacs/github/issues/99 that is old and needs
some love from @github ...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 6c11d07759bcb6e697d2aea37ce7e88b5e0c0260
Component: engine
2014-11-19 00:29:04 -05:00
Vincent Batts
65e57f8b27
overlayfs: more helpful output when not supported
...
based on https://github.com/docker/docker/pull/7619#discussion_r20385086
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com >
Upstream-commit: 3287ca1e45f74a2eac214070ccb937c7c7030a06
Component: engine
2014-11-18 22:53:04 -05:00
Sven Dowideit
de98d16e28
Merge pull request #9203 from somaopensource/fix_link
...
fix link to PACKAGERS.md
Upstream-commit: c8926bb5792ebea6e7b16935fa7fce577446574a
Component: engine
2014-11-18 18:23:33 -08:00
Chun Chen
018bd0f92c
Clean config path of bind mount volume
...
Signed-off-by: Chun Chen <chenchun.feed@gmail.com >
Upstream-commit: f4acfeebda431239c98e07ed8c0d55422e165d4e
Component: engine
2014-11-19 10:13:10 +08:00
Sven Dowideit
c8b93c2707
If an image has more than one repo name or tag, it'll be listed more than once
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 57b6993c2c99dd89a3cbe012935a82966d88aa92
Component: engine
2014-11-18 18:06:22 -08:00