1
0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Commit Graph

10830 Commits

Author SHA1 Message Date
Richard Metzler
ea8fa13170 Empty Line should fix Markdown unordered list
Without the line break the list would render as one single paragraph.
Upstream-commit: 91a8b916b09615119e80a1193f1a2f6c01143106
Component: engine
2014-11-23 23:57:43 +01:00
Jessie Frazelle
8bf9a8d42c Merge pull request #9223 from vbatts/vbatts-overlay_notfound
overlayfs: more helpful output when not supported
Upstream-commit: c59b308b6b2fc8112a93d64f4922b0ece01a4e6a
Component: engine
2014-11-21 19:58:01 -08:00
Jessie Frazelle
17175863b2 Merge pull request #9188 from somaopensource/8777-fix
Fix for #8777 (continuing PR #9061)
Upstream-commit: d7626e97b61f5f8f5d585ec82d6154395a3f9404
Component: engine
2014-11-21 17:57:56 -08:00
Michael Crosby
5f6e6e9df3 Merge pull request #9183 from vbatts/dm_udevwait
devmapper: Call UdevWait() even in failure path
Upstream-commit: fb1540199e2a7fb8aaf7918a9a35d1f21adeaad5
Component: engine
2014-11-21 17:28:37 -08:00
Vincent Batts
354971bf12 Merge pull request #9267 from crosbymichael/devmapper-mknod
Mknod more loopbacks for devmapper
Upstream-commit: 104d27a07b78f1a029e60b69a4488132982ae12e
Component: engine
2014-11-21 20:23:43 -05:00
Michael Crosby
664428ef8f Merge pull request #9086 from vbatts/vbatts-tarsum_more_tests
pkg/tarsum: adding more tests
Upstream-commit: e820365b677cff6a5f3b073da1a3ebb21e5f8247
Component: engine
2014-11-21 17:12:55 -08:00
Michael Crosby
5e63676399 Merge pull request #9185 from djmaze/patch-1
Fix link to MAINTAINERS.md in CONTRIBUTING.md
Upstream-commit: 496db275d540d754774d4e2867bdcb666464af20
Component: engine
2014-11-21 16:40:27 -08:00
Michael Crosby
0c37aeb40b Mknod more loopbacks for devmapper
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: f8509e7940d73ecc0071faf15a865acb1f8dad52
Component: engine
2014-11-21 16:20:35 -08:00
Martin Honermeyer
c20c704755 Fix link to MAINTAINERS.md in CONTRIBUTING.md
Signed-off-by: Martin Honermeyer <maze@strahlungsfrei.de>
Upstream-commit: 20218f39718673d3ae5822aeecfd08ea0c6e8126
Component: engine
2014-11-22 01:18:40 +01:00
unclejack
d66b329d87 Merge pull request #9270 from jfrazelle/8919-tag-output
Output image with tag name when image is not found
Upstream-commit: 07b7bdb4fcd97efee02d9eb3c19ada7f54d60c25
Component: engine
2014-11-22 01:56:31 +02:00
Michael Crosby
21eb3ab253 Merge pull request #9265 from vieux/daemon_labels
add daemon labels (displayed in docker info)
Upstream-commit: c78bf8d86a912adafa0c2514e9224431a887b197
Component: engine
2014-11-21 15:14:27 -08:00
Tianon Gravi
7eeacf5615 Add some minor reorganization to the Makefile preamble
The gist here is a reemphasizing of the explicitly "user mutable" bits by putting them first (and hopefully improving readability a little bit in the process).

Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 82f33d86a7c4d41d3c880757d35c81c847a9ab69
Component: engine
2014-11-21 15:49:09 -07:00
Sven Dowideit
50546730f2 Merge pull request #9209 from SvenDowideit/shared-disk-space-images
If an image has more than one repo name or tag, it'll be listed more tha...
Upstream-commit: 44159f38d2b6d92e21b7c4b43bfd9ba7dce3719e
Component: engine
2014-11-21 14:07:45 -08:00
Vincent Batts
95c96f42c9 Merge pull request #9149 from swagiaal/fix-configureBridge-comment
Remove reference to 'ifaceName' from configureBridge comment.
Upstream-commit: a43ee077dca75d0e8f198275db17eac341b0ca8c
Component: engine
2014-11-21 16:37:28 -05:00
Vincent Batts
6951abbd89 Merge pull request #9009 from a-ba/fix-export-repo
fix missing layers when exporting a full repository 
Upstream-commit: a5277764aed9e5493387a6f4caf2bb93a0a6afa3
Component: engine
2014-11-21 15:44:27 -05:00
Victor Vieux
eec853d8c5 key=values -> key=value
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 62a7d75512d939a86cbc58986278548df3302902
Component: engine
2014-11-21 19:15:22 +00:00
Alexander Morozov
8d3c39cea7 Merge pull request #9261 from unclejack/fix_test_tmp_cleanup
fix cleanup of /tmp in tests
Upstream-commit: 0f2de5158fe66b4906de176f90e3e6d813336450
Component: engine
2014-11-21 08:48:04 -08:00
Arnaud Porterie
f702226e49 Merge pull request #9225 from icecrime/win_make_binary
Adapt project/make.sh for Windows builds
Upstream-commit: ce8ebaf0e013fd4a7f6e04b36d0a2c57a19aeef9
Component: engine
2014-11-21 08:37:19 -08:00
unclejack
2388eefc7e graphdriver/aufs: fix tmp cleanup in tests
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 4180579313e84ea7e3d85214521a815e95459a90
Component: engine
2014-11-21 18:31:45 +02:00
Jessica Frazelle
c878d4a442 Apply same typed iptables errors to network driver.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: f6c7194539720473aae814d3d1445eab2a78d568
Component: engine
2014-11-20 18:07:15 -08:00
Jessica Frazelle
cbc7790607 Typed errors for iptables chain raw command output. YAYYYYYY.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 6cc75574b3b01fa4dfeeef585e52dbcf8da28586
Component: engine
2014-11-20 18:07:11 -08:00
Michael Crosby
b4f3f7d0fc Merge pull request #9259 from duglin/Issue9221
Make --tlsverify enable tls regardless of value specified
Upstream-commit: 532e502e9c37d1caab59f9e8d188f6700b197ebb
Component: engine
2014-11-20 17:41:31 -08:00
Michael Crosby
3d66822e1d Merge pull request #9248 from vbatts/vbatts-fix_gh9241
pkg/tarsum: actually init the TarSum struct
Upstream-commit: 5d67a3faea400273e4307db7990a51fc2d2ca0dc
Component: engine
2014-11-20 17:15:15 -08:00
unclejack
73a99e1a72 Merge pull request #9269 from crosbymichael/update-libcontainer-nov20
Update libcontainer to 84c1636580a356db88b079d118b94abe6a1a0acd
Upstream-commit: 5cde77d003892fa20f82f9bf586c7623494d6cbf
Component: engine
2014-11-21 02:50:04 +02:00
Doug Davis
f7e2fcdfb9 Make --tlsverify enable tls regardless of value specified
I also needed to add a mflag.IsSet() function that allows you to check
to see if a certain flag was actually specified on the cmd line.

Per #9221 - also tweaked the docs to fix a typo.

Closes #9221

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: ae9bd580af55992974fcb94f73f72cc3b2257fec
Component: engine
2014-11-20 16:09:06 -08:00
Fred Lifton
ed1ade4c80 Merge pull request #9220 from SvenDowideit/add-apache-foreground-eg
Add an example that shows starting apache in the foreground
Upstream-commit: 29f4ea2cd5ee0988abb24264e4dbf01fa52d2d54
Component: engine
2014-11-20 16:02:38 -08:00
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
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
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
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