Jessie Frazelle
52a52909a8
Merge pull request #9488 from crosbymichael/update-libcontainer-dec3
...
Update libcontainer to 53eca435e63db58b06cf796d3a9
2014-12-05 12:05:06 -08:00
Michael Crosby
2525a04594
Merge pull request #9493 from SvenDowideit/note-lxc-conf-pitfall
...
Note that using -lxc-conf to change things Docker manages has pitfalls
2014-12-05 11:16:19 -08:00
Michael Crosby
8bfe4d906e
Merge pull request #9528 from SvenDowideit/add-license-to-docs
...
Add Apache license and link to the docs
2014-12-05 11:15:47 -08:00
Sven Dowideit
522e631096
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 >
2014-12-05 21:06:11 +10:00
Sven Dowideit
8dfcbf62ed
Merge pull request #9272 from SvenDowideit/pr_out_try_out_a_different_phrase_for_icc
...
Try out a different phrase for --icc
2014-12-05 16:22:51 +10:00
James Turnbull
a10b0cd23f
Merge pull request #9504 from davidmat/patch-1
...
Update Amazon EC2 Docker installation instructions
2014-12-04 21:57:45 -08:00
James Turnbull
ebf89cf219
Merge pull request #9507 from jsternberg/docker-build-docs-formatting-fix
...
Fixing docs formatting for the forcerm flag on docker build
2014-12-04 21:54:14 -08:00
Fred Lifton
84dc2c83cb
Merge pull request #9464 from SvenDowideit/sven_tries_webhooks
...
Add some extra details to webhook docs
2014-12-04 19:44:26 -08:00
James Turnbull
0bd51836c8
Merge pull request #9516 from SvenDowideit/tweak-sidebar-css-for-more-spacing
...
this v spacing irritated me while i was reading
2014-12-04 19:26:08 -08:00
Sven Dowideit
b266ad9c60
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)
2014-12-05 13:05:38 +10:00
Sven Dowideit
b4b899264e
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 >
2014-12-05 12:13:22 +10:00
Sven Dowideit
11a75ec97f
this v spacing irritated me while i was reading
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-12-05 12:01:13 +10:00
Sven Dowideit
8e59bda173
Merge pull request #9388 from SvenDowideit/update-docs-from-cli
...
Auto-update documentation from the output of the cli.
2014-12-05 11:11:28 +10:00
Sven Dowideit
e01baa6be7
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)
2014-12-05 10:43:38 +10:00
Michael Crosby
6e7a210db6
Merge pull request #9510 from crosbymichael/chrootarchive
...
Use consistent ApplyLayer in overlayfs
2014-12-04 14:21:26 -08:00
Michael Crosby
f47d6b9b9d
Use consistent ApplyLayer in overlayfs
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-12-04 12:03:44 -08:00
David Mat
da667581cf
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)
2014-12-04 21:02:29 +01:00
Jessie Frazelle
bfde3f2cd1
Merge pull request #9494 from jfrazelle/cleanup
...
Cleanup unnecessary abstractions in integration-cli
2014-12-04 11:29:21 -08:00
Jonathan A. Sternberg
eb7d646a44
Fixing docs formatting for the forcerm flag on docker build
...
Signed-off-by: Jonathan A. Sternberg <jonathansternberg@gmail.com >
2014-12-04 12:35:31 -05:00
James Turnbull
603fe40661
Merge pull request #9495 from SvenDowideit/aws-cli-exclude-still-broken
...
Something changed, broke the docs release script, and it seems that --ex...
2014-12-04 03:14:34 -05:00
Sven Dowideit
6d560e197c
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 >
2014-12-04 16:10:55 +10:00
Jessica Frazelle
6fd818f3ef
Fix output format where no variable specified in mount pkg
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-12-03 19:02:51 -08:00
Jessica Frazelle
4ee3a318a1
Run 'go vet' on integration-cli.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-12-03 18:45:51 -08:00
Jessica Frazelle
fa753e67ae
Remove unnessary abstraction deepEqual
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-12-03 17:52:06 -08:00
Sven Dowideit
b91d330088
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)
2014-12-04 11:49:06 +10:00
Jessica Frazelle
02a021119f
Remove unnecessary abstraction nLines
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-12-03 17:47:28 -08:00
Jessica Frazelle
7ba9a18ade
cleanup: remove startCommand function, only used once, and
...
unecessary abstraction.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-12-03 17:43:26 -08:00
Jessica Frazelle
7c7026bd22
Be consistent about libtrust import path.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-12-03 17:36:14 -08:00
James Turnbull
e15ffa45a6
Merge pull request #9486 from ClusterHQ/9484-fromSrc-api-docs
...
Document fromSrc more clearly
2014-12-03 20:31:44 -05:00
Jessie Frazelle
8520fd55b6
Merge pull request #9451 from erikh/fix-sqlite
...
graphdb: initialize the database semi-idempotently on every connection, not just new installs.
2014-12-03 17:17:20 -08:00
Michael Crosby
e2a4b730ca
Merge pull request #9490 from jfrazelle/fix-test-cmd-eff
...
Fix tests with old cmd function.
2014-12-03 16:29:31 -08:00
Jessica Frazelle
e201d5bcd4
Fix tests with old cmd function.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-12-03 15:53:19 -08:00
Jessie Frazelle
67fda33197
Merge pull request #9089 from cpuguy83/8942_create_volumes_on_create
...
Initialize volumes when container is created
2014-12-03 15:42:09 -08:00
Michael Crosby
269b37503e
Update libcontainer to 53eca435e63db58b06cf796d3a9
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-12-03 14:53:11 -08:00
Jean-Paul Calderone
0888c1880f
Update the most recent released version of the docs as well.
...
Signed-off-by: Jean-Paul Calderone <exarkun@twistedmatrix.com >
2014-12-03 17:14:08 -05:00
Jean-Paul Calderone
826f809d09
Talk about URL support and the real meaning of - in the latest fromSrc API documentation.
...
Signed-off-by: Jean-Paul Calderone <exarkun@twistedmatrix.com >
2014-12-03 17:13:48 -05:00
Alexander Morozov
c8ccfcb930
Merge pull request #9482 from ncdc/TempArchive-close-bug
...
Fix invalid argument error on push
2014-12-03 14:13:15 -08:00
Andy Goldstein
48ec176cd5
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 >
2014-12-03 16:12:24 -05:00
Michael Crosby
5d49d2bb7a
Merge pull request #9426 from lhuard1A/overlay_rename
...
Rename overlayfs to overlay
2014-12-03 10:57:42 -08:00
Lénaïc Huard
2352f00e4f
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 >
2014-12-03 14:06:19 +01:00
Lénaïc Huard
d680ca5c96
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 >
2014-12-03 13:57:23 +01:00
Sven Dowideit
070a519a9b
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)
2014-12-03 12:46:23 +10:00
Sven Dowideit
94d67d5d5b
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)
2014-12-03 12:46:23 +10:00
Sven Dowideit
a74c12177f
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)
2014-12-03 12:46:16 +10:00
Michal Minar
a2aa78f6ec
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)
2014-12-03 12:46:16 +10:00
Michal Minar
aa00ad47e2
Man: describe storage options
...
Documented --storage-opt=[] option in man 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)
2014-12-03 12:46:16 +10:00
Michal Minar
a61a4a3188
Man: describe --icc option better
...
Current description is misleading. It make an impression the --icc=false
prevents containers to talk with each other.
Signed-off-by: Michal Minar <miminar@redhat.com >
Docker-DCO-1.1-Signed-off-by: Michal Minar <miminar@redhat.com > (github: SvenDowideit)
2014-12-03 12:46:16 +10:00
Sven Dowideit
70c4b4eded
Merge pull request #9429 from sindhus/patch-1
...
Fix dead link in oracle.md
2014-12-03 12:38:17 +10:00
Fred Lifton
315520b845
Merge pull request #9430 from sindhus/patch-3
...
Fix dead link cli.md
2014-12-02 16:06:48 -08:00
Michael Crosby
bc7ef42716
Merge pull request #9463 from jlhawn/tarsum_test_fix
...
Fix TarSum iteration test
2014-12-02 15:55:07 -08:00