Michael Crosby
f41ced96af
Ensure that ownership and perms are copied to volume
...
This only works if the file or dir is already created in
the image before setting it to be a volume. There is no way around this
because we don't have the data avaliable to set the volume at the
beginning of the dockerfile
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-06-02 18:06:58 -07:00
Michael Crosby
f65fadbda0
Merge pull request #6143 from LK4D4/move_some_more_tests_to_cli
...
Move some more tests to integration cli
2014-06-02 18:06:11 -07:00
Sven Dowideit
dd93845ad0
Merge pull request #6056 from ipbabble/master
...
Made fixes to man pages to remove some ambiguities and typos
2014-06-02 18:01:22 -07:00
unclejack
a8ade72b6a
Merge pull request #6168 from vieux/add_proto_validation
...
add proto validation at parse
2014-06-03 03:55:41 +03:00
Victor Marmol
70b778751e
Merge pull request #6153 from vishh/stats1
...
Add per cpu usage to libcontainer stats
2014-06-02 17:53:17 -07:00
Victor Vieux
98d7b720c2
Merge pull request #6169 from vieux/add_volumes_inspect_back
...
add volumes back to inspect
2014-06-02 17:07:00 -07:00
Victor Vieux
996133b9ba
add volumes back to inspect
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-03 00:05:54 +00:00
Victor Vieux
0633b12b28
add proto validation at parse
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-02 23:03:10 +00:00
Victor Vieux
b292928cd5
Merge pull request #5848 from unclejack/resumable_pulls
...
resume pulling the layer on disconnect
2014-06-02 14:07:01 -07:00
Victor Vieux
dcba54aa99
Merge pull request #6166 from vieux/debug_skipping
...
switch skipping from error to debug
2014-06-02 14:01:49 -07:00
Victor Vieux
af6ab357e8
switch skipping from error to debug
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-02 20:47:07 +00:00
unclejack
aa61cc759b
Merge pull request #6165 from vieux/update_tests
...
Update tests regarding busybox & inspect
2014-06-02 23:39:12 +03:00
Victor Vieux
730d9ba174
fix busybox image detection
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-02 19:57:20 +00:00
Victor Vieux
b8932abcd3
pull only busybox:latest
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-02 19:54:17 +00:00
LK4D4
ae128437ce
Move build cache tests to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-02 23:40:14 +04:00
LK4D4
bf4d907092
More verbose build tests
...
I've decided that custom asserts only hide the meaning of tests
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-02 23:40:13 +04:00
LK4D4
2e85568816
Aux functions for build testing
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-02 23:40:13 +04:00
Sven Dowideit
afb2d5de3d
Merge pull request #6159 from SvenDowideit/s3-json-fixup
...
aws json is not javascript style json. trailing comma breaks it :(
2014-06-02 12:28:57 -07:00
Victor Vieux
55230b3332
Merge pull request #6138 from NERSC/6092-setuidrace
...
Fix for setuid race condition in LXC driver
2014-06-02 12:16:00 -07:00
Victor Vieux
c136384b20
Merge pull request #6160 from crosbymichael/update-test-for-nil-error
...
Update cpu stat test for no error
2014-06-02 12:12:49 -07:00
Victor Vieux
24ea088124
Merge pull request #6147 from cyphar/6142-mflag-strip-quotes-long-equal-form
...
mflag: strip quotes in certain forms from flag values
2014-06-02 12:03:58 -07:00
Michael Crosby
3e13aaec00
Merge pull request #6130 from vieux/standardize_api_keys
...
Standardize api keys to CamelCase
2014-06-02 12:03:11 -07:00
Victor Vieux
43b7af1dd1
Merge pull request #6150 from LK4D4/remove_used_from_streamformatter
...
Remove unused and racy "used" param from streamformatter
2014-06-02 11:56:05 -07:00
Michael Crosby
30fdac2cb1
Update cpu stat test for no error
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-06-02 11:54:23 -07:00
Michael Crosby
f1a217be0f
Merge pull request #6116 from vishh/nsinit_stats
...
Adding "stats" and "spec" option to nsinit CLI
2014-06-02 11:44:37 -07:00
unclejack
2a1b7f222a
resume pulling the layer on disconnect
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-06-02 21:41:22 +03:00
SvenDowideit
cac24bbfaf
aws json is not javascript style json. trailing comma breaks it :(
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-06-03 04:30:32 +10:00
James Turnbull
d3ff00948f
Merge pull request #6157 from SvenDowideit/pr_out_update_networking_md
...
Update networking.md
2014-06-02 13:46:26 -04:00
Alexandr Morozov
1ae37cef91
Remove unused and racy "used" param from streamformatter
...
Also tests written
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-02 21:43:07 +04:00
Andre Dublin
4ac216d8d3
Update networking.md
...
grammar
Docker-DCO-1.1-Signed-off-by: Andre Dublin <81dublin@gmail.com> (github: andredublin)
rebased by
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-06-03 03:41:53 +10:00
Sven Dowideit
2404ce3d26
Merge pull request #6154 from SvenDowideit/pr_out_adding_user_guide
...
Adding User Guide
2014-06-02 10:39:15 -07:00
Vishnu Kannan
3723d6341e
Adding percpu usage to cgroup stats reported by libcontainer.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-06-02 06:56:15 +00:00
Vishnu Kannan
f7b82be0dd
Adding "stats" and "spec" option to nsinit binary which will print the stats and spec respectively.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-06-02 06:37:22 +00:00
cyphar
e4497feaba
pkg: mflag: flag: added tests for quote-stripped flags
...
This patch adds some tests to ensure that quoted flags are properly
handled by the mflag package.
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
2014-06-02 15:25:38 +10:00
cyphar
0e9c40eb82
pkg: mflag: flag: make mflag strip quotes in -flag="var" forms
...
This patch improves the mflag package to ensure that things arguments
to mflag such as `-flag="var"` or `-flag='var'` have the quotes
stripped from the value (to mirror the getopt functionality for similar
flags).
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
2014-06-02 15:25:33 +10:00
William Henry
2858180a9a
Changed the term rename to alias etc.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)
Changes to be committed:
modified: contrib/man/md/docker-tag.1.md
2014-06-01 17:16:14 -06:00
James Turnbull
a7b2c4804b
Adding User Guide
...
* Added User Guide section outlines.
* Added User Guide to menu.
* Moved HTTPS example to articles.
* Replaced Hello World example with User Guide.
* Moved use cases out of examples.
* Updated Introduction to add User Guide.
* Redirected migrated /use and /articles links.
* Added Docker.io section
* Added Dockerized section
* Added Using Docker section
* Added Docker Images section
* Added Docker Links section
* Added Docker Volumes section
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-06-01 17:34:07 -04:00
Sven Dowideit
4edcbfdeb7
Merge pull request #6140 from zanedeg/patch-1
...
Updated link to new docker-node-hello repository
2014-06-02 07:32:43 +10:00
Sven Dowideit
758e23df4d
Merge pull request #5924 from SvenDowideit/docs-build-instructions
...
Add documentation build steps for the next release manager to follow.
2014-06-01 08:31:51 +10:00
SvenDowideit
953abf6ae7
Add documentation build steps for the next release manager to follow.
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-06-01 08:31:33 +10:00
unclejack
2024a0e517
Merge pull request #6089 from unclejack/docker_build_copy
...
add support for COPY to docker build
2014-06-01 01:26:31 +03:00
William Henry
e471a87f19
Fixed some typos and other issues from ostezer comments.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)
Changes to be committed:
modified: contrib/man/md/docker-build.1.md
modified: contrib/man/md/docker-run.1.md
modified: contrib/man/md/docker-tag.1.md
2014-05-31 15:44:17 -06:00
O.S. Tezer
b51802a47c
Merge pull request #6073 from SvenDowideit/b2d-port-redirection-docs
...
sync the initial port redirection docs from b2d
2014-05-31 13:58:28 -07:00
Zane DeGraffenried
0658868c7f
Updated link to new docker-node-hello repository
2014-05-31 14:55:59 -06:00
Shane Canon
f9705477d0
Fix for setuid race condition in LXC driver
...
This is a fix for a race condition in the LXC driver. This is described
more in issue #6092 .
Closes #6092
Docker-DCO-1.1-Signed-off-by: Shane Canon <scanon@lbl.gov> (github: scanon)
2014-05-31 10:42:48 -07:00
unclejack
05cf3498a6
Merge pull request #6128 from crosbymichael/empty-sqlite
...
Init database if empty file
2014-05-31 06:56:00 +03:00
unclejack
af31fe95cd
Merge pull request #6129 from crosbymichael/copy-all-in-priv
...
Ensure all dev nodes are copied for privileged
2014-05-31 06:40:20 +03:00
Michael Crosby
69989b7c06
Ensure all dev nodes are copied for privileged
...
This also makes sure that devices are pointers to avoid copies
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-05-30 18:39:11 -07:00
Victor Vieux
1dd02ff4a0
update docs
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-05-31 01:28:08 +00:00
Victor Vieux
68fb7f4b74
Standardize API keys: CamelCase
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-05-31 01:22:07 +00:00