cda4353dab
implement wait on freeze
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: dc21dd2634791d272b8e39493815bb81eaba5605
Component: engine
2014-06-04 02:21:10 +00:00
b048abf5ab
Merge pull request #6183 from crosbymichael/fix-freezer-fs
...
Don't rejoin the freezer cgroup each time
Upstream-commit: 2c27e6e9abb01d5a1c8c5d1c16aef6daf82b6b99
Component: engine
2014-06-03 16:16:58 -07:00
525251ebaa
Merge pull request #6180 from unclejack/apparmor
...
apparmor: write & load the profile on every start
Upstream-commit: 37d69aae5e2aaf914629d9f416fd59c34deb94ab
Component: engine
2014-06-03 15:56:28 -07:00
44f1195c6c
Don't rejoin the cgroup each time
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 534521301c81bcc536446351cf4018f02d477d2a
Component: engine
2014-06-03 15:24:30 -07:00
02bad2214b
Merge pull request #6181 from SvenDowideit/change-out-port-number
...
IANA allocated Docker port: 2375
Upstream-commit: a2ec8fa1db6e2e77d29f58623f35c2b2ded8e3b7
Component: engine
2014-06-04 01:07:48 +03:00
6fe87514fd
Merge pull request #6164 from jamtur01/automated
...
Changed all references from Trusted Builds to Automated Builds
Upstream-commit: 201d20fe3411d09e12cd6bee1c17082cfc2595cb
Component: engine
2014-06-03 15:06:09 -07:00
7d5cb46a54
apparmor: write & load the profile on every start
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 1ef3ca83d8624aaaaed05cfce1f71282d70d84dd
Component: engine
2014-06-04 00:56:35 +03:00
ddc2df6d84
IANA allocated Docker port: 2375
...
2375/2376 are assigned:
http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=docker
For #1440
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 5febba93babcf8c4b01862e88b6f6e11a1532bc8
Component: engine
2014-06-04 06:54:19 +10:00
6fe0f07752
Changed all references from Trusted Builds to Automated Builds
...
* Updated docker images output
* Deprecated docker images -t/--trusted option and replace with --automated
* Changed *trusted variables to *automated
* Changed added support for is_automated alongside deprecated is_trusted
* Updated man pages, docs and completion
* Updated API documentation
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 9fc8028c987ac560ceb3b29eb609d77a82abdacc
Component: engine
2014-06-03 12:55:30 -07:00
e6849d8d6c
Merge pull request #6125 from crosbymichael/systemd-freezer
...
Implement systemd support for freezer
Upstream-commit: 2f514fb8917ccd3e3e2a389e70d571f8a5982b3b
Component: engine
2014-06-03 11:39:21 -07:00
8443458d22
Merge pull request #6173 from zdover23/03_Jun_2014
...
grammar; nothing big (added a "the")
Upstream-commit: 7f55d92837b74180939e2e4714ee66395497836e
Component: engine
2014-06-03 10:48:20 -07:00
f20c102828
Implement systemd support for freezer
...
These PR does a few things. It ensures that the freezer cgroup is
joined in the systemd driver. It also provides a public api for setting
the freezer state via the cgroups package.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 613f74c1fbbdc5e476d28974d1dbe3727033d083
Component: engine
2014-06-03 10:46:53 -07:00
7414dab461
Merge pull request #6175 from alexlarsson/systemd-use-raw-devices
...
libcontainer/cgroup: Use raw access to set up and join the devices cgroup
Upstream-commit: ae93939414de00878df1d0030ecbdaa124b75b07
Component: engine
2014-06-03 10:38:31 -07:00
7d08ad30f3
Merge pull request #4430 from vbatts/vbatts-images_orphan
...
Adding -f untagged=true flag to `docker images`
Upstream-commit: 5aeb77296a974e512a533f9014376ce837f05b50
Component: engine
2014-06-03 20:33:56 +03:00
0c475a0cf3
filters: don't encode empty set. API docs
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 02255ddaa4948fd94450fd5d9d2ee9b147e88352
Component: engine
2014-06-03 12:19:26 -04:00
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
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
8ce68c5f96
grammar; nothing big
...
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com > (github: zdover23)
Added another "The"
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com > (github: zdover23)
Upstream-commit: 3a77a73a856f50a5954f22c5a76395ca77e43d00
Component: engine
2014-06-03 15:40:22 +10:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
353629f404
filters: don't encode an empty set. update comments
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 3a4e3ca3277fef8f1d88858fa5a3e149a897f8ae
Component: engine
2014-06-02 16:33:52 -04:00
2a107417ae
filters: use json marshal, instead of beam/data
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 89a15fa235f0aab6dd326a3737260c983f0fc22b
Component: engine
2014-06-02 16:33:52 -04:00
e355fe478a
filters: change untagged to dangling
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 3ecfaa8f2da60bb4e6ce6c9ae0428bc7b647e34b
Component: engine
2014-06-02 16:33:52 -04:00
c3f842bed4
server: very debug.
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: f322168563dee9d0361524d15c6a5069772b44f8
Component: engine
2014-06-02 16:33:52 -04:00
2dd212e295
filter flag: split out for separate --filter flags
...
adding tests and allowing for easy passing of filters.Args from client
to server.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: f1cc7ce5d728d6bdb1b3ab668e36fb1fc66515ff
Component: engine
2014-06-02 16:33:51 -04:00
f418e0d639
images: fix markdown documentation
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 3391aac2b27ac95f58a20a2eb4046ad1f00b8be6
Component: engine
2014-06-02 16:33:51 -04:00
9a7aaea6bb
images filter: remove the redundant inverted filter
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: cb7857de5d2595632b76e4e17acede85a519001a
Component: engine
2014-06-02 16:33:51 -04:00
9030fc74aa
filters: cleanup & fmt
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: babd5720157898bb33d806bda920d9f9f2df73f0
Component: engine
2014-06-02 16:33:51 -04:00
bf13fd92ad
filters, for images: docs
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 55d95185edd4a646cd2a05b9397be6b8667d60d0
Component: engine
2014-06-02 16:33:51 -04:00
1771a9601a
filters: remove out filter proc prototype
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: caf9b19b0c444467aff493781afb66df923250ff
Component: engine
2014-06-02 16:33:50 -04:00
f90ca07ea9
filters, for images: start with untagged/tagged boolean
...
This is a new feature and flag. (replaces the suggestion of a flag for
--untagged images).
The concept is to have a syntax to filter. This begins with this
filtering for the 'images' subcommand, and at that only filtering for
whether images are untagged.
example like: docker rmi $(docker images -q --filter 'untagged=true')
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 5f3812ec97f9a951bceb482fdcd355b6cbc1b113
Component: engine
2014-06-02 16:33:50 -04:00
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
