Arnaud Porterie
e2032febfb
Merge pull request #9543 from ErikDubbelboer/racefix
...
Removed race condition
Upstream-commit: f91a79e071db20e45fa61e0f606ce944121822c4
Component: engine
2014-12-06 09:08:36 -08:00
Erik Dubbelboer
c21c1c5984
Removed race condition
...
If two interrupts were fired really quickly interruptCount could have been incremented twice before the LoadUint32 making cleanup not being called at all.
Signed-off-by: Erik Dubbelboer <erik@dubbelboer.com >
Upstream-commit: 46b1194d996f6535e657bcb88428303305d3fe68
Component: engine
2014-12-06 22:52:19 +08:00
Alexander Morozov
93dd7fb297
Merge pull request #9479 from jlhawn/tarsum_test_fix
...
Correct TarSum benchmarks: 9kTar and 9kTarGzip
Upstream-commit: 984b072a37ee090bc24511137919211ec2fbb542
Component: engine
2014-12-05 14:47:54 -08:00
Jessie Frazelle
d93f5cf597
Merge pull request #9488 from crosbymichael/update-libcontainer-dec3
...
Update libcontainer to 53eca435e63db58b06cf796d3a9
Upstream-commit: 52a52909a86581bc246eff00ca7b1fdffb770c09
Component: engine
2014-12-05 12:05:06 -08:00
Michael Crosby
2aeb9859a8
Merge pull request #9493 from SvenDowideit/note-lxc-conf-pitfall
...
Note that using -lxc-conf to change things Docker manages has pitfalls
Upstream-commit: 2525a04594eed2ca4e13e9ded83f406529bad299
Component: engine
2014-12-05 11:16:19 -08:00
Michael Crosby
5961d7dec3
Merge pull request #9528 from SvenDowideit/add-license-to-docs
...
Add Apache license and link to the docs
Upstream-commit: 8bfe4d906e7629eb78302a87b0109194627e63ed
Component: engine
2014-12-05 11:15:47 -08:00
Sven Dowideit
8953683264
I was talking to someone whom i listen to, and she noted that our docs don't mention the license
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 522e6310967bcb4fadd99d76dc3205991ecae1ad
Component: engine
2014-12-05 21:06:11 +10:00
Sven Dowideit
996111b8d3
Merge pull request #9272 from SvenDowideit/pr_out_try_out_a_different_phrase_for_icc
...
Try out a different phrase for --icc
Upstream-commit: 8dfcbf62edb2853176eb3f5cf077dae68f2e85c3
Component: engine
2014-12-05 16:22:51 +10:00
James Turnbull
49f85cd111
Merge pull request #9504 from davidmat/patch-1
...
Update Amazon EC2 Docker installation instructions
Upstream-commit: a10b0cd23f806944c7e5d6515cdbf07af49bad9b
Component: engine
2014-12-04 21:57:45 -08:00
James Turnbull
d60bbfaec3
Merge pull request #9507 from jsternberg/docker-build-docs-formatting-fix
...
Fixing docs formatting for the forcerm flag on docker build
Upstream-commit: ebf89cf2198acd6953adabc24ffc44aaac5c0780
Component: engine
2014-12-04 21:54:14 -08:00
Fred Lifton
fbf4eeb228
Merge pull request #9464 from SvenDowideit/sven_tries_webhooks
...
Add some extra details to webhook docs
Upstream-commit: 84dc2c83cb208144763740f12354d3e37d9fa135
Component: engine
2014-12-04 19:44:26 -08:00
James Turnbull
4eac49ffb5
Merge pull request #9516 from SvenDowideit/tweak-sidebar-css-for-more-spacing
...
this v spacing irritated me while i was reading
Upstream-commit: 0bd51836c8c06f79db9eb355375427f2d039d37e
Component: engine
2014-12-04 19:26:08 -08:00
Sven Dowideit
635b9dd208
Show image of the Build trigger screen, and add a little search engine fodder for it.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: b266ad9c607588e8541926dfca7e338148e904ff
Component: engine
2014-12-05 13:05:38 +10:00
Sven Dowideit
822c213004
Add some extra details to webhook docs
...
Update the webhook JSON payloads to real ones,
and show there is a difference between an automated build webhook payload and a normal repo payload
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Upstream-commit: b4b899264ed892818ef31c3626acad8fb110aabb
Component: engine
2014-12-05 12:13:22 +10:00
Sven Dowideit
e8f1ddbeb0
this v spacing irritated me while i was reading
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 11a75ec97f904b1807dbdc7121ac4e19dc229d49
Component: engine
2014-12-05 12:01:13 +10:00
Sven Dowideit
68e2369944
Merge pull request #9388 from SvenDowideit/update-docs-from-cli
...
Auto-update documentation from the output of the cli.
Upstream-commit: 8e59bda173669366ae99944458f2a5a03d13fb99
Component: engine
2014-12-05 11:11:28 +10:00
Sven Dowideit
6a592dd8e6
Auto-update documentation from the output of the cli.
...
I've re-jigged the run man page so that each option's text begins with the
cli's help text for that flag, and then ay subsequent lines in the man page
are carried forward.
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: e01baa6be782320d3c0800697c882c2b919b202f
Component: engine
2014-12-05 10:43:38 +10:00
Michael Crosby
5190e1516a
Merge pull request #9510 from crosbymichael/chrootarchive
...
Use consistent ApplyLayer in overlayfs
Upstream-commit: 6e7a210db69eb59b08a1b1deb76f89630d5bece4
Component: engine
2014-12-04 14:21:26 -08:00
Michael Crosby
ac96967ba9
Use consistent ApplyLayer in overlayfs
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: f47d6b9b9de8c567e9e42e12243cbcce99a7bfc7
Component: engine
2014-12-04 12:03:44 -08:00
David Mat
82038e31a9
Update Amazon EC2 Docker installation instructions
...
The installation guide for EC2 is outdated, as the current version of Amazon Linux (2014.09) is now Docker ready. No need to go through the manual route anymore. The official AMI has Docker packages in the repository now (this was the 'pre-release' option in the outdated instructions).
Docker-DCO-1.1-Signed-off-by: David Mat <david@davidmat.com > (github: davidmat)
Upstream-commit: da667581cffec4048d848454266b8d3cad55c859
Component: engine
2014-12-04 21:02:29 +01:00
Jessie Frazelle
d749cd5cd2
Merge pull request #9494 from jfrazelle/cleanup
...
Cleanup unnecessary abstractions in integration-cli
Upstream-commit: bfde3f2cd1807cf4472462819645851c58b22e72
Component: engine
2014-12-04 11:29:21 -08:00
Jonathan A. Sternberg
25e75bf1f1
Fixing docs formatting for the forcerm flag on docker build
...
Signed-off-by: Jonathan A. Sternberg <jonathansternberg@gmail.com >
Upstream-commit: eb7d646a44d76c4a7f96fa6ef28de9fbbbaf17ca
Component: engine
2014-12-04 12:35:31 -05:00
James Turnbull
22351497b2
Merge pull request #9495 from SvenDowideit/aws-cli-exclude-still-broken
...
Something changed, broke the docs release script, and it seems that --ex...
Upstream-commit: 603fe406615817678e6f6b67ab6ac5ec094a8988
Component: engine
2014-12-04 03:14:34 -05:00
Josh Hawn
9d37d55377
Correctly close generated benchmark archives
...
Another update to TarSum tests, this patch fixes an issue where
the benchmarks were generating archives incorrectly by not closing
the tarWriter.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 385917e22c5bd0d577a5a0be0de9e88a0499fe87
Component: engine
2014-12-03 22:26:06 -08:00
Sven Dowideit
3b1609f4c6
Something changed, broke the docs release script, and it seems that --exclude still doesn't work, so I'm removing it
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 6d560e197ccde8f1d711ad8260cf399b078c404d
Component: engine
2014-12-04 16:10:55 +10:00
Jessica Frazelle
de88b2cc7b
Fix output format where no variable specified in mount pkg
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 6fd818f3ef8ca018b74544362c37d41a1095ba9d
Component: engine
2014-12-03 19:02:51 -08:00
Jessica Frazelle
61a90c5a2b
Run 'go vet' on integration-cli.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 4ee3a318a1f43f35a8c6ec8b6b73db5ea8824de9
Component: engine
2014-12-03 18:45:51 -08:00
Jessica Frazelle
9442c6a19e
Remove unnessary abstraction deepEqual
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: fa753e67ae2bf573c9dfb1da1e1135c5ef5ef415
Component: engine
2014-12-03 17:52:06 -08:00
Sven Dowideit
f3226b6931
Note that using -lxc-conf to change things Docker manages has pitfalls
...
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: b91d330088958bca4e59285a55fdc5593d2a86ad
Component: engine
2014-12-04 11:49:06 +10:00
Jessica Frazelle
2a07b18ca1
Remove unnecessary abstraction nLines
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 02a021119fb2b3e051b98817831a8c1a8a9fd464
Component: engine
2014-12-03 17:47:28 -08:00
Jessica Frazelle
4cd694cddb
cleanup: remove startCommand function, only used once, and
...
unecessary abstraction.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 7ba9a18ade7393d942d995d34a92d757ef4af0b7
Component: engine
2014-12-03 17:43:26 -08:00
Jessica Frazelle
482d9b0df3
Be consistent about libtrust import path.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 7c7026bd2255cef47cbb026afe0b984d4c9a9130
Component: engine
2014-12-03 17:36:14 -08:00
James Turnbull
7930a900f5
Merge pull request #9486 from ClusterHQ/9484-fromSrc-api-docs
...
Document fromSrc more clearly
Upstream-commit: e15ffa45a670041ceee06c3b51dff177b5f3378f
Component: engine
2014-12-03 20:31:44 -05:00
Jessie Frazelle
65e3ca93a1
Merge pull request #9451 from erikh/fix-sqlite
...
graphdb: initialize the database semi-idempotently on every connection, not just new installs.
Upstream-commit: 8520fd55b66b44f669f6ad6886c7c46d066bd6ca
Component: engine
2014-12-03 17:17:20 -08:00
Michael Crosby
56a5536647
Merge pull request #9490 from jfrazelle/fix-test-cmd-eff
...
Fix tests with old cmd function.
Upstream-commit: e2a4b730ca6cc339122d013f33fedd593d95d1f3
Component: engine
2014-12-03 16:29:31 -08:00
Jessica Frazelle
b108f27ddc
Fix tests with old cmd function.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: e201d5bcd46a3dcb70dd6b6e23ee375e4b5b5f40
Component: engine
2014-12-03 15:53:19 -08:00
Jessie Frazelle
e1ce0e0de9
Merge pull request #9089 from cpuguy83/8942_create_volumes_on_create
...
Initialize volumes when container is created
Upstream-commit: 67fda331973fdd23f3da79588ea899dc577f46e8
Component: engine
2014-12-03 15:42:09 -08:00
Michael Crosby
7f73c7a751
Update libcontainer to 53eca435e63db58b06cf796d3a9
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 269b37503e00f86b9215bc6fe27c502cf4d90072
Component: engine
2014-12-03 14:53:11 -08:00
Jean-Paul Calderone
3d5681303b
Update the most recent released version of the docs as well.
...
Signed-off-by: Jean-Paul Calderone <exarkun@twistedmatrix.com >
Upstream-commit: 0888c1880f836703987313049100bad9ce821584
Component: engine
2014-12-03 17:14:08 -05:00
Jean-Paul Calderone
d3f88b9d6d
Talk about URL support and the real meaning of - in the latest fromSrc API documentation.
...
Signed-off-by: Jean-Paul Calderone <exarkun@twistedmatrix.com >
Upstream-commit: 826f809d0959d59d4f478615be4dc9b7db7c46f1
Component: engine
2014-12-03 17:13:48 -05:00
Alexander Morozov
cdaba1e671
Merge pull request #9482 from ncdc/TempArchive-close-bug
...
Fix invalid argument error on push
Upstream-commit: c8ccfcb93048e24dbe08b2c449dd1ad802f730f4
Component: engine
2014-12-03 14:13:15 -08:00
Andy Goldstein
717d7acf81
Fix invalid argument error on push
...
With 32ba6ab from #9261 , TempArchive now closes the underlying file and
cleans it up as soon as the file's contents have been read. When pushing
an image, PushImageLayerRegistry attempts to call Close() on the layer,
which is a TempArchive that has already been closed. In this situation,
Close() returns an "invalid argument" error.
Add a Close method to TempArchive that does a no-op if the underlying
file has already been closed.
Signed-off-by: Andy Goldstein <agoldste@redhat.com >
Upstream-commit: 48ec176cd51da20e23564941da2d9906a7779d28
Component: engine
2014-12-03 16:12:24 -05:00
Michael Crosby
576cfafbf2
Merge pull request #9426 from lhuard1A/overlay_rename
...
Rename overlayfs to overlay
Upstream-commit: 5d49d2bb7a3bafcd1481a05d56ebc39ecd394393
Component: engine
2014-12-03 10:57:42 -08:00
Josh Hawn
54cbb45483
Correct TarSum benchmarks: 9kTar and 9kTarGzip
...
These two cases did not actually read the same content with each iteration
of the benchmark. After the first read, the buffer was consumed. This patch
corrects this by using a bytes.Reader and seeking to the beginning of the
buffer at the beginning of each iteration.
Unfortunately, this benchmark was not actually as fast as we believed. But
the new results do bring its results closer to those of the other benchmarks.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 92fd49f7ca42cf5d97825853034eac685b90fc1d
Component: engine
2014-12-03 10:44:05 -08:00
Lénaïc Huard
d0fa330b7f
Remove the last references to overlayfs
...
This only renames docker internal structures.
It has no impact on the end-user.
Signed-off-by: Lénaïc Huard <lhuard@amadeus.com >
Upstream-commit: 2352f00e4ff2cd102a4d591d67aba8e1c7eaa7b6
Component: engine
2014-12-03 14:06:19 +01:00
Lénaïc Huard
34e4a16b13
Rename the overlay storage driver
...
so that docker is started with `docker -d -s overlay` instead of `docker -d -s overlayfs`
Signed-off-by: Lénaïc Huard <lhuard@amadeus.com >
Upstream-commit: d680ca5c96484474757fb6f92274f47bf1520631
Component: engine
2014-12-03 13:57:23 +01:00
Sven Dowideit
215ea5a487
fixes as per feedback
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 070a519a9b972ffffda62b82fbc27825d4a6f9b0
Component: engine
2014-12-03 12:46:23 +10:00
Sven Dowideit
7045c111d6
Try out a different phrase for --icc
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 94d67d5d5b300c346e17503810d521c91db89c14
Component: engine
2014-12-03 12:46:23 +10:00
Sven Dowideit
bef6ed45c4
80-char limit
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: a74c12177f02be97730b83ded9521a14ba568bcd
Component: engine
2014-12-03 12:46:16 +10:00
Michal Minar
291b777b81
Doc: described storage-driver options in cli reference
...
Documented --storage-opt=[] option in cli reference page. Content taken
from:
daemon/graphdriver/devmapper/README.md
Signed-off-by: Michal Minar <miminar@redhat.com >
Docker-DCO-1.1-Signed-off-by: Michal Minar <miminar@redhat.com > (github: SvenDowideit)
Upstream-commit: a2aa78f6ec9e0a654f92c57336f8e487477d4040
Component: engine
2014-12-03 12:46:16 +10:00
Arnaud Porterie
Erik Dubbelboer
Alexander Morozov
Jessie Frazelle
Michael Crosby
Sven Dowideit
Sven Dowideit
James Turnbull
Fred Lifton
Sven Dowideit
Michael Crosby
David Mat
Jonathan A. Sternberg
Josh Hawn
Jessica Frazelle
Jean-Paul Calderone
Andy Goldstein
Lénaïc Huard
Michal Minar