fb6f6f58b2
Add Eric Windisch to MAINTAINER for tarsum
...
This code is vital to the security of the project and it is important
we assure it is well-maintained and guarded.
I am vested in assuring this code maintains security and
provides as much compatibility as possible between releases.
Signed-off-by: Eric Windisch <eric@windisch.us >
Upstream-commit: cd71f92a7fda7a8bdf328a91c37a759463862aeb
Component: engine
2014-08-20 11:19:46 -07:00
652c673ef1
Merge pull request #7495 from sontags/enable_search_on_private_reg
...
Enable `docker search` on private docker registry.
Upstream-commit: 2eb26991f4ef47225a7312e65660debf1d8f6b48
Component: engine
2014-08-20 18:10:29 +02:00
0186e144d0
Merge pull request #5129 from vieux/host_resolv
...
allow /etc/hosts /etc/resolv.conf and /etc/hostname to be changed
Upstream-commit: 94fbcea7a305e9810f3f6349fe9a778c90a25993
Component: engine
2014-08-20 11:02:36 -05:00
55a0a050b4
Merge pull request #7633 from fredlf/root_builder_warning
...
Added warning re: using root for dockerfile root. Fixes #7612
Upstream-commit: 494bea9fba229dd388d8912fe72936af4a54f73b
Component: engine
2014-08-20 08:02:38 -04:00
a4c03cd9ac
Merge pull request #7635 from bfirsh/docs-https-newsletter-url
...
Use HTTPS for newsletter signup form
Upstream-commit: 0d26b7cc6d9c5625e5cdc483db90d9ae1228209c
Component: engine
2014-08-20 08:01:27 -04:00
93cdd9219d
Merge pull request #7640 from xiaods/develop
...
Cleanup: correct cli --volumes-from description
Upstream-commit: 9faf0254ef0871d5113cc91319228b8472474d34
Component: engine
2014-08-20 08:01:05 -04:00
46c8de1eaa
Cleanup: correct cli --volumes-from description
...
issue #7580 volumes-from comma separated list mentioned this case.
Options like --volumes-from=[] indicate they can be specified multiple times:
docker run -it --rm --volumes-from TEST_DATA --volumes-from TEST_DATA2 ubuntu bash
Signed-off-by: Deshi Xiao <dxiao@redhat.com >
Upstream-commit: 4d0b88c52f896fe159fe2b1dfd7bdb8116c31da3
Component: engine
2014-08-20 16:31:04 +08:00
4300ef9d0c
Fixed a typo and added a bit based on Sven's feedback
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 98dd982586ed9fd99853001d4a27503180e432c4
Component: engine
2014-08-19 17:22:11 -07:00
3cb90fd37e
Use HTTPS for newsletter signup form
...
This is causing an insecure HTTPS error in Chrome 37.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: 8c7915fcded75128dab9724782baebb17fbcd9f4
Component: engine
2014-08-19 15:39:37 -07:00
f066236203
Added warning re: using root for dockerfile root. Fixes #7612
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: b63c10558e6fe187d9cee25a4d8bad4bffd7f79b
Component: engine
2014-08-19 13:39:50 -07:00
e1c4c1ad6b
Merge pull request #7608 from LK4D4/remove_internet_dep
...
Remove internet dependency from TestBuildCacheADD
Upstream-commit: d4c2d0c57f18a7b09be95ba62d7476f3c3c81ede
Component: engine
2014-08-19 14:13:52 -05:00
86ad3b1104
Merge pull request #7602 from unclejack/tarsum_garbage_reduction
...
pkg/tarsum: avoid buf2 allocation in Read
Upstream-commit: 487af281bf39417f95d51c70557e9e5ca3e90f8d
Component: engine
2014-08-19 13:50:15 -04:00
f789bbd122
Merge pull request #7613 from VojtechVitek/godoc_travis
...
Add GoDoc and Travis build link/images to README
Upstream-commit: 7db55a1807d3fb2771026a1016c50cdd94d6b039
Component: engine
2014-08-19 12:21:05 -05:00
03f9c00b29
Merge pull request #7604 from SvenDowideit/docs-update
...
update the cli / man page docs based on what is in master right now
Upstream-commit: abc134677740803ea2e854ae0e87cfa4cfbd202a
Component: engine
2014-08-19 10:12:50 -07:00
36c8101330
Merge pull request #7628 from crosbymichael/fix-search-test
...
Fix search test for busybox image
Upstream-commit: 39bcc3a3e540e7ddb2abacb9e188491d489ce990
Component: engine
2014-08-19 12:11:29 -05:00
09240bd768
add small doc
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 26feb09fac7cfcafef36cc71df1176301c70eb53
Component: engine
2014-08-19 17:06:17 +00:00
fb74f9294f
add tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: fc39f9c78d89332d2364c4781010f5fb4b500fe4
Component: engine
2014-08-19 17:06:17 +00:00
796b032af2
allow /etc/hosts /etc/resolv.conf and /etc/hostname to be changed
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: f3b2c93b9f01ac909de4f93753a21eacb02bcd9f
Component: engine
2014-08-19 17:06:17 +00:00
d9d0f62578
Fix search test for busybox image
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: dad2fcb1993d9cd7c513db10965aa37d7f9a542d
Component: engine
2014-08-19 09:52:46 -07:00
2ede62e71d
Merge pull request #7610 from remram44/patch-1
...
Fixes "note" blockquote too long [doc, minor]
Upstream-commit: 366fe67946c553c89c696b46307dd6e15e8c6c40
Component: engine
2014-08-19 09:11:15 +10:00
f481aa1f06
Add GoDoc and Travis build link/images to README
...
Signed-off-by: Vojtech Vitek (V-Teq) <vvitek@redhat.com >
Upstream-commit: 7cb68713552d2b153ed18bc6dcdcee5b69ef0a5f
Component: engine
2014-08-19 01:08:47 +02:00
b71571fd04
Fixes "note" blockquote too long [doc, minor]
...
A "note" block includes too much text, so if you skip over it the next paragraph makes zero sense.
Upstream-commit: 99082de9ada13a5898e769c176a88488d310b1a4
Component: engine
2014-08-18 15:31:37 -04:00
de283f5963
Merge pull request #7597 from crosbymichael/update-libcontainer-aug4
...
Update libcontainer to 29363e2d2d7b8f62a5f353be333
Upstream-commit: 37db53bf7a14613d7502a2e38b5806d90a766c1a
Component: engine
2014-08-18 12:24:17 -05:00
b18ccc6846
Remove internet dependency from TestBuildCacheADD
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 075e1bc1c35b5f130f6ae7961782ff9af79817bc
Component: engine
2014-08-18 14:13:43 +04:00
43acaaf00e
update the cli / man page docs based on what is in master right now
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 018e75a6e4ef955cd802267818b6a6c81a600c9a
Component: engine
2014-08-18 09:31:58 +10:00
e56ddc1f46
pkg/tarsum: avoid buf2 allocation in Read
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 55533693be0f268d7d7a2d339369ce8617398542
Component: engine
2014-08-17 14:45:11 +03:00
88ae7e1f1f
resolved merge conflict
...
Signed-off-by: Daniel Menet <membership@sontags.ch >
Upstream-commit: c1ee94a343850b0d726b3c6beb6054957068805f
Component: engine
2014-08-16 14:29:15 +02:00
06081e86de
Expand hostname before passing it to NewRegistry()
...
Signed-off-by: Daniel Menet <membership@sontags.ch >
Upstream-commit: 676308b853a43bb7be4838e937ab4effff670b1a
Component: engine
2014-08-16 14:25:46 +02:00
bc706dc232
Enable docker search on private docker registry.
...
The cli interface works similar to other registry related commands:
docker search foo
... searches for foo on the official hub
docker search localhost:5000/foo
... does the same for the private reg at localhost:5000
Signed-off-by: Daniel Menet <membership@sontags.ch >
Upstream-commit: 3231033a80451adff73b53554e27fbabfebb4a4f
Component: engine
2014-08-16 14:24:32 +02:00
693c6c8fed
Update libcontainer to 29363e2d2d7b8f62a5f353be333
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: a67d06fd4343024ed25c3faf40e58c9a1935c28a
Component: engine
2014-08-15 15:41:05 -07:00
81204a3417
Merge pull request #7594 from vieux/remove_empty_folder
...
remove empty builder folder
Upstream-commit: 7afb98ad5d50c9c8e606826684663df1b158cb02
Component: engine
2014-08-15 10:57:14 -07:00
746910e315
remove empty builder folder
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 57564d91a4128f7ee2952e7bdbda54463deac03b
Component: engine
2014-08-15 17:52:44 +00:00
ef4beedfeb
Merge pull request #7589 from shykes/cleanup-img-depth
...
Cleanup: move image depth checks in image/
Upstream-commit: 101c749b6533ab309eccea6b6c6173a0c25f787d
Component: engine
2014-08-15 10:47:36 -07:00
3c73976245
Merge pull request #7593 from tianon/remove-crashtest
...
Remove crashTest.go since the use case is covered by docker-stress
Upstream-commit: a20f4ce291589bc909d961893db2efd621f3af48
Component: engine
2014-08-15 10:43:45 -07:00
ae82a3441b
Remove crashTest.go since the use case is covered by docker-stress
...
Signed-off-by: Andrew Page <admwiggin@gmail.com >
Upstream-commit: 3a70ca3c671053f599d4f3b226c2a787b369e752
Component: engine
2014-08-15 11:28:58 -06:00
397a4ab41c
Merge pull request #7581 from samuel-phan/patch-1
...
Update docker-attach.1.md
Upstream-commit: d1fc32e265c57d78dcbfd1ddf2d272c1ebd27c8b
Component: engine
2014-08-14 18:36:23 -07:00
1aae74c809
Merge pull request #7562 from jperrin/master
...
Updated CentOS documentation to reflect CentOS 7 install.
Upstream-commit: 31bd4a19c9e88ac450495c0cb4dd594b7cc4be9f
Component: engine
2014-08-14 18:32:05 -07:00
399d98c0d7
Merge pull request #7546 from hollietealok/master
...
Added fredlf's suggested changes.
Upstream-commit: 4bcc7e283f4191d2505bc87c2eaa5a38cb15b356
Component: engine
2014-08-14 18:27:50 -07:00
ef058f588f
Cleanup: move image depth checks in image/
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
Upstream-commit: 2a39635d30a5ecbf3f8020dcb272cd8ae939fe06
Component: engine
2014-08-15 00:43:12 +00:00
ae69b5776a
Merge pull request #7582 from LK4D4/fix_races
...
Fix some race conditions
Upstream-commit: 5a1e4a1092fca71d886c74ac8d6c59c56f1efaec
Component: engine
2014-08-14 14:35:04 -07:00
0b9e4ed61e
Cleanup: Make channels unbuffered
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 0d4d7e4a2851c60f768f71a79a78c068fd9dffe8
Component: engine
2014-08-14 21:51:25 +04:00
c26305d808
Fix race on state serialization
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: f1975cbc7c5b551e5a206c15f32aef3d51904408
Component: engine
2014-08-14 21:51:15 +04:00
1b8bad68b3
Fix race between container cleanup and inspect/ps
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 93d6adf8a19855edf118d27d0239222f572d8292
Component: engine
2014-08-14 21:51:06 +04:00
f4db7d15dc
Fix race condition in sending started signal from monitor
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 1480168e9f6178e4015aa4dcc035a6963c59f431
Component: engine
2014-08-14 21:50:56 +04:00
c395d23539
Merge pull request #7126 from ostezer/update-certificates
...
Docs: articles/certificates.md rewrite.
Upstream-commit: 17112704b99405aa642df37d5c8b7e369dd0b4ab
Component: engine
2014-08-14 08:52:08 -04:00
974ae2755d
Update docker-attach.1.md
...
Upstream-commit: 5073554ca67f7f1f3f21d87cab766708556486c2
Component: engine
2014-08-14 14:20:38 +02:00
5144e74fe1
Merge pull request #7573 from vieux/remove_double_newline
...
remove double newline
Upstream-commit: a7d116f1b0e81a739e7451e6f852805c479c68d6
Component: engine
2014-08-13 23:24:30 -07:00
1ca8702dce
Merge pull request #7544 from metalivedev/fixmailmap
...
Fix my email entry. FIxing email entry.
Upstream-commit: 31a9c97d7d1abeb8ef544c3a3da7e3307a96a323
Component: engine
2014-08-13 20:05:56 -07:00
d5f518ec2f
Merge pull request #7532 from ChristopherBiscardi/shiftWindow
...
Remove Old shiftWindow()
Upstream-commit: f945edb3e0ae42645f1f52026edbf0869044379d
Component: engine
2014-08-14 12:48:19 +10:00
9df494bb71
another commit to do like @crosbymichael
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: a0392324f194f4f92e3205f0c0ed8b71dc2fc93f
Component: engine
2014-08-14 01:36:26 +00:00
