Alexander Larsson
006edb2caf
libcontainer/cgroup: Use raw access to set up and join the devices cgroup
...
The systemd support for the devices cgroup lacks two required features:
* Support for wildcards to allow mknod on any device
* Support for wildcards to allow /dev/pts support
The second is available in more recent systemd as "char-pts", but not in e.g. v208 which is in wide use.
Additionally, the current approach of letting systemd set up the devices cgroup and then adding
some devices to it doesn't work, because some times systemd (at least v208) re-initializes
the devices cgroup, overwriting our custom devices. See https://github.com/dotcloud/docker/issues/6009
for the details.
When wildcarded mknod support is available in systemd we should implement a pure systemd version,
but we need to keep the old one around for backwards compat.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 6b8f0e394b3960bba1db982c62c002221419f3f5
Component: engine
2014-06-03 11:34:14 +02:00
Victor Vieux
b4a026cf85
Merge pull request #6172 from tianon/remove-duplicated-magic-values
...
Move duplicated FS "magic" values to the graphdriver package so they can be shared
Upstream-commit: dccf3362041b4c8f450428f34ec7b4d365b2feaa
Component: engine
2014-06-02 23:25:46 -07:00
James Turnbull
b3698a5dd2
Merge pull request #6122 from mheon/fix_manpage_issue
...
Added documentation for special case in run command
Upstream-commit: 19e4fddcce70201223420099737dd5f840ec2def
Component: engine
2014-06-02 21:19:43 -07:00
Tianon Gravi
55a81e78b4
Move duplicated FS "magic" values to the graphdriver package so they can be shared instead of duplicated
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 68476e277f953d1076c8e966691769d5a35e65b6
Component: engine
2014-06-02 19:56:47 -06:00
Victor Marmol
f363828126
Merge pull request #6171 from crosbymichael/add-chroot
...
Add SYS_CHROOT cap to unprivileged containers
Upstream-commit: 5bf4068d60222b1fdfc997e498aa2096b8df3cf9
Component: engine
2014-06-02 18:33:34 -07:00
Michael Crosby
382f8a23ad
Add SYS_CHROOT cap to unprivileged containers
...
Fixes #6103
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 41f7cef2bd186d321fc4489691ba53ab41eb48e5
Component: engine
2014-06-02 18:23:47 -07:00
unclejack
6017cb1878
Merge pull request #6167 from crosbymichael/volume-ownership
...
Retain volume ownership and permissions
Upstream-commit: 3fb08708788816a62f062305cb9244c1b2077ed4
Component: engine
2014-06-03 04:23:30 +03:00
Victor Vieux
f0fe28011a
Merge pull request #6170 from vieux/redirect_login
...
Add redirect and env proxy support to docker login
Upstream-commit: fd342cb777700ecb66254b17867fbc591dca7213
Component: engine
2014-06-02 18:19:28 -07:00
Michael Crosby
fef574365b
Add test for volume ownership and perms
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: c024c9bd1ec13aade038f87266a03a1d1bc13441
Component: engine
2014-06-02 18:10:52 -07:00
Michael Crosby
4038755eae
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)
Upstream-commit: f41ced96af9dba56dd368e213e6e83fd02b85b03
Component: engine
2014-06-02 18:06:58 -07:00
Michael Crosby
cd037b482e
Merge pull request #6143 from LK4D4/move_some_more_tests_to_cli
...
Move some more tests to integration cli
Upstream-commit: f65fadbda080647ccb7e07dc64a8cc020170c4c7
Component: engine
2014-06-02 18:06:11 -07:00
Sven Dowideit
fa1cbab9b2
Merge pull request #6056 from ipbabble/master
...
Made fixes to man pages to remove some ambiguities and typos
Upstream-commit: dd93845ad0b6dc0df3d06a6a0521469ae7e4286d
Component: engine
2014-06-02 18:01:22 -07:00
unclejack
15bad66c8d
Merge pull request #6168 from vieux/add_proto_validation
...
add proto validation at parse
Upstream-commit: a8ade72b6ae5818b28c2f1a45f74dd5363efdc24
Component: engine
2014-06-03 03:55:41 +03:00
Victor Marmol
3e5c143450
Merge pull request #6153 from vishh/stats1
...
Add per cpu usage to libcontainer stats
Upstream-commit: 70b778751e72d9f616b80a41dd35fdfe1c5ba032
Component: engine
2014-06-02 17:53:17 -07:00
Victor Vieux
792ff163c7
Add redirect and env proxy support to docker login
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 4e7254840bc60f31e501c52e25990c540015e83b
Component: engine
2014-06-03 00:46:06 +00:00
Victor Vieux
e52b485d58
Merge pull request #6169 from vieux/add_volumes_inspect_back
...
add volumes back to inspect
Upstream-commit: 98d7b720c2abf72c3f58f45680fcf60df45a3664
Component: engine
2014-06-02 17:07:00 -07:00
Victor Vieux
fe1f6345d0
add volumes back to inspect
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 996133b9babbe4c4dfb42ee0d5aea9566568af14
Component: engine
2014-06-03 00:05:54 +00:00
Victor Vieux
6e829f27f8
add proto validation at parse
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 0633b12b286d763521124f6d144deade89a89bfc
Component: engine
2014-06-02 23:03:10 +00:00
Victor Vieux
72a70c7e5f
Merge pull request #5848 from unclejack/resumable_pulls
...
resume pulling the layer on disconnect
Upstream-commit: b292928cd5414e3fc3452d409e490460adbd5e51
Component: engine
2014-06-02 14:07:01 -07:00
Victor Vieux
48abbf72dc
Merge pull request #6166 from vieux/debug_skipping
...
switch skipping from error to debug
Upstream-commit: dcba54aa99fa924df41c383afa55c983649277d0
Component: engine
2014-06-02 14:01:49 -07:00
Victor Vieux
9b403bb6e9
switch skipping from error to debug
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: af6ab357e8db8888429a28014f629af19a2250b8
Component: engine
2014-06-02 20:47:07 +00:00
unclejack
1b543a839e
Merge pull request #6165 from vieux/update_tests
...
Update tests regarding busybox & inspect
Upstream-commit: aa61cc759b3b204cf71689c361d50de756bd9cf5
Component: engine
2014-06-02 23:39:12 +03:00
Victor Vieux
da1e276039
fix busybox image detection
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 730d9ba17421e82012664c44aef7f64600b756cb
Component: engine
2014-06-02 19:57:20 +00:00
Victor Vieux
82a799b98b
pull only busybox:latest
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: b8932abcd3f3932b6b56aa859b4c0762a95f7179
Component: engine
2014-06-02 19:54:17 +00:00
LK4D4
21fda68864
Move build cache tests to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: ae128437cefa93bba082a0231e2cd05d33991c81
Component: engine
2014-06-02 23:40:14 +04:00
LK4D4
2b6fe57d0d
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)
Upstream-commit: bf4d907092a81bf8c6bd8a6a2ce2105aa3c8c11d
Component: engine
2014-06-02 23:40:13 +04:00
LK4D4
ecc54a77db
Aux functions for build testing
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 2e85568816315a6544ce1c379a5b2b714fb16524
Component: engine
2014-06-02 23:40:13 +04:00
Sven Dowideit
6b5620e888
Merge pull request #6159 from SvenDowideit/s3-json-fixup
...
aws json is not javascript style json. trailing comma breaks it :(
Upstream-commit: afb2d5de3de56ff54e1a25f402e369b5f4eb45d0
Component: engine
2014-06-02 12:28:57 -07:00
Victor Vieux
b3478bf7eb
Merge pull request #6138 from NERSC/6092-setuidrace
...
Fix for setuid race condition in LXC driver
Upstream-commit: 55230b3332f8a24b5100bfa54df5beedf078cd51
Component: engine
2014-06-02 12:16:00 -07:00
Victor Vieux
26c494ff41
Merge pull request #6160 from crosbymichael/update-test-for-nil-error
...
Update cpu stat test for no error
Upstream-commit: c136384b20970af7b73d16f912fae9b5bffa6b2c
Component: engine
2014-06-02 12:12:49 -07:00
Victor Vieux
c760899ade
Merge pull request #6147 from cyphar/6142-mflag-strip-quotes-long-equal-form
...
mflag: strip quotes in certain forms from flag values
Upstream-commit: 24ea088124f00896eefc166da1b9e2fad4a03273
Component: engine
2014-06-02 12:03:58 -07:00
Michael Crosby
77921a7a55
Merge pull request #6130 from vieux/standardize_api_keys
...
Standardize api keys to CamelCase
Upstream-commit: 3e13aaec000aeaa16718e2408b0c371e4de69137
Component: engine
2014-06-02 12:03:11 -07:00
Victor Vieux
f8096c1d0a
Merge pull request #6150 from LK4D4/remove_used_from_streamformatter
...
Remove unused and racy "used" param from streamformatter
Upstream-commit: 43b7af1dd128b98777d076361d38408e835d24cc
Component: engine
2014-06-02 11:56:05 -07:00
Michael Crosby
2e677833d3
Update cpu stat test for no error
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 30fdac2cb1bd5461972cef6efa3d67270db23491
Component: engine
2014-06-02 11:54:23 -07:00
Michael Crosby
40e79b8f9e
Merge pull request #6116 from vishh/nsinit_stats
...
Adding "stats" and "spec" option to nsinit CLI
Upstream-commit: f1a217be0ff4ad04c40fd9630fac024fd2c0a581
Component: engine
2014-06-02 11:44:37 -07:00
unclejack
29a9622323
resume pulling the layer on disconnect
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 2a1b7f222a5eff596cabb5ebd88a481a83b24402
Component: engine
2014-06-02 21:41:22 +03:00
SvenDowideit
7eeb43108c
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)
Upstream-commit: cac24bbfaf59570863a75e34a21b70ce1cc5c51f
Component: engine
2014-06-03 04:30:32 +10:00
James Turnbull
52d3ae44c1
Merge pull request #6157 from SvenDowideit/pr_out_update_networking_md
...
Update networking.md
Upstream-commit: d3ff00948fe28e40cd876159b92a3026c15d1f2c
Component: engine
2014-06-02 13:46:26 -04:00
Alexandr Morozov
11c1a24c8e
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)
Upstream-commit: 1ae37cef9189976c7d3838ba0899e874a0758379
Component: engine
2014-06-02 21:43:07 +04:00
Andre Dublin
071672b2fe
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)
Upstream-commit: 4ac216d8d3441b8546798711320cb5679d33984d
Component: engine
2014-06-03 03:41:53 +10:00
Sven Dowideit
5d9995fc13
Merge pull request #6154 from SvenDowideit/pr_out_adding_user_guide
...
Adding User Guide
Upstream-commit: 2404ce3d261cd54596646f2008e0664a5e1be2cf
Component: engine
2014-06-02 10:39:15 -07:00
Vishnu Kannan
656618108c
Adding percpu usage to cgroup stats reported by libcontainer.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: 3723d6341effa7698ccbb05ab708b0c25ee1af02
Component: engine
2014-06-02 06:56:15 +00:00
Vishnu Kannan
8148195e5a
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)
Upstream-commit: f7b82be0dd1dc0d9b0fa6c9c194dc2c90af3d133
Component: engine
2014-06-02 06:37:22 +00:00
cyphar
af5c1612d8
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)
Upstream-commit: e4497feaba31dd33bad790f77f783afc0c695020
Component: engine
2014-06-02 15:25:38 +10:00
cyphar
460cf60260
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)
Upstream-commit: 0e9c40eb8243fa437bc6c3e93aaff64a10cb856e
Component: engine
2014-06-02 15:25:33 +10:00
William Henry
5d504d032a
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
Upstream-commit: 2858180a9a05dad999df0f4d9adc9750b0fb1c66
Component: engine
2014-06-01 17:16:14 -06:00
James Turnbull
1b1746cd69
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)
Upstream-commit: a7b2c4804b2d98c2b5622db40d3d70b88529d7fe
Component: engine
2014-06-01 17:34:07 -04:00
Sven Dowideit
e0357c5a9f
Merge pull request #6140 from zanedeg/patch-1
...
Updated link to new docker-node-hello repository
Upstream-commit: 4edcbfdeb7d056f47f2eba13c6e005324381ff9e
Component: engine
2014-06-02 07:32:43 +10:00
Sven Dowideit
e26a29105d
Merge pull request #5924 from SvenDowideit/docs-build-instructions
...
Add documentation build steps for the next release manager to follow.
Upstream-commit: 758e23df4d8dbc0c35e70762521215a20c8a6a71
Component: engine
2014-06-01 08:31:51 +10:00
SvenDowideit
1dae3a407b
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)
Upstream-commit: 953abf6ae7b31a3563fa57a9898305018add0571
Component: engine
2014-06-01 08:31:33 +10:00