26246ebd53
Integrating systemd freeze functionality.
...
This pulls together #6061 and #6125
Docker-DCO-1.1-Signed-off-by: Chris Alfonso <calfonso@redhat.com> (github: calfonso)
2014-06-04 13:33:44 -06:00
b054569cde
Add ability to pause/unpause containers via cgroups freeze
...
This patch adds pause/unpause to the command line, api, and drivers
for use on containers. This is implemented using the cgroups/freeze
utility in libcontainer and lxc freeze/unfreeze.
Co-Authored-By: Eric Windisch <ewindisch@docker.com>
Co-Authored-By: Chris Alfonso <calfonso@redhat.com>
Docker-DCO-1.1-Signed-off-by: Ian Main <imain@redhat.com> (github: imain)
2014-06-04 13:33:44 -06:00
1f5b323208
Merge pull request #6187 from vieux/wait_freeze
...
Implement wait on freeze
2014-06-04 12:00:20 -07:00
eb3e2f4f47
pass address of metaHeaders to GetenvJson in ImagePush and ImagePull
...
Docker-DCO-1.1-Signed-off-by: kies <lleelm@gmail.com> (github: kieslee)
2014-06-04 17:54:06 +08:00
9f14ff83b2
Merge pull request #6191 from snowch/patch-1
...
Small clarification
2014-06-04 01:56:01 -07:00
2e14f0f70a
Update builder.md
2014-06-04 08:08:44 +01:00
3704996089
Merge pull request #6082 from FLGMwt/2342-change-wording-uploading-context
...
Change 'Uploading context' wording
2014-06-03 23:58:20 -07:00
dc21dd2634
implement wait on freeze
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-04 02:21:10 +00:00
2a92c53a06
Merge pull request #6186 from unclejack/fix_typo_aufsgo
...
fix diffs->diff typo in aufs.go
2014-06-03 16:59:43 -07:00
c11fadb282
Make debian init work when called quickly.
...
We use the start-stop-daemon pid creation mechanism in addition the intrinsic built into docker. This means the pid file is guaranteed to be written out by the time the script exits.
See #6184 .
Docker-DCO-1.1-Signed-off-by: Joe Beda <joe.github@bedafamily.com> (github: jbeda)
2014-06-03 16:57:32 -07:00
7a60b9063c
fix diffs->diff typo in aufs.go
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-06-04 02:46:55 +03:00
2c27e6e9ab
Merge pull request #6183 from crosbymichael/fix-freezer-fs
...
Don't rejoin the freezer cgroup each time
2014-06-03 16:16:58 -07:00
37d69aae5e
Merge pull request #6180 from unclejack/apparmor
...
apparmor: write & load the profile on every start
2014-06-03 15:56:28 -07:00
534521301c
Don't rejoin the cgroup each time
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-06-03 15:24:30 -07:00
a2ec8fa1db
Merge pull request #6181 from SvenDowideit/change-out-port-number
...
IANA allocated Docker port: 2375
2014-06-04 01:07:48 +03:00
201d20fe34
Merge pull request #6164 from jamtur01/automated
...
Changed all references from Trusted Builds to Automated Builds
2014-06-03 15:06:09 -07:00
1ef3ca83d8
apparmor: write & load the profile on every start
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-06-04 00:56:35 +03:00
d96eb47dee
Added note in manpages to clarify effect of docker start on started container
...
When run on a container that is already running, docker always succeeds.
This was an intentional change in v0.10; it previously caused an error.
This commit clarifies the man pages to indicate this is intended behavior.
Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com> (github: mheon)
2014-06-03 17:10:59 -04:00
5febba93ba
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)
2014-06-04 06:54:19 +10:00
9fc8028c98
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)
2014-06-03 12:55:30 -07:00
2f514fb891
Merge pull request #6125 from crosbymichael/systemd-freezer
...
Implement systemd support for freezer
2014-06-03 11:39:21 -07:00
7f55d92837
Merge pull request #6173 from zdover23/03_Jun_2014
...
grammar; nothing big (added a "the")
2014-06-03 10:48:20 -07:00
613f74c1fb
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)
2014-06-03 10:46:53 -07:00
ae93939414
Merge pull request #6175 from alexlarsson/systemd-use-raw-devices
...
libcontainer/cgroup: Use raw access to set up and join the devices cgroup
2014-06-03 10:38:31 -07:00
5aeb77296a
Merge pull request #4430 from vbatts/vbatts-images_orphan
...
Adding -f untagged=true flag to `docker images`
2014-06-03 20:33:56 +03:00
02255ddaa4
filters: don't encode empty set. API docs
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
2014-06-03 12:19:26 -04:00
d9885abdc4
reuse the febootstrap-minimize from rinse
...
Docker-DCO-1.1-Signed-off-by: Sam Bailey <sam@thatsamguy.com> (github: thatsamguy)
2014-06-03 20:41:32 +10:00
b611198d28
mount of /.dockerinit is not needed for native driver, so move it into lxc driver
...
Docker-DCO-1.1-Signed-off-by: Albert Zhang <zhgwenming@gmail.com> (github: zhgwenming)
2014-06-03 18:13:54 +08:00
6b8f0e394b
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)
2014-06-03 11:34:14 +02:00
dccf336204
Merge pull request #6172 from tianon/remove-duplicated-magic-values
...
Move duplicated FS "magic" values to the graphdriver package so they can be shared
2014-06-02 23:25:46 -07:00
3a77a73a85
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)
2014-06-03 15:40:22 +10:00
19e4fddcce
Merge pull request #6122 from mheon/fix_manpage_issue
...
Added documentation for special case in run command
2014-06-02 21:19:43 -07:00
68476e277f
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)
2014-06-02 19:56:47 -06:00
5bf4068d60
Merge pull request #6171 from crosbymichael/add-chroot
...
Add SYS_CHROOT cap to unprivileged containers
2014-06-02 18:33:34 -07:00
41f7cef2bd
Add SYS_CHROOT cap to unprivileged containers
...
Fixes #6103
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-06-02 18:23:47 -07:00
3fb0870878
Merge pull request #6167 from crosbymichael/volume-ownership
...
Retain volume ownership and permissions
2014-06-03 04:23:30 +03:00
fd342cb777
Merge pull request #6170 from vieux/redirect_login
...
Add redirect and env proxy support to docker login
2014-06-02 18:19:28 -07:00
c024c9bd1e
Add test for volume ownership and perms
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-06-02 18:10:52 -07:00
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
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
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
a8ade72b6a
Merge pull request #6168 from vieux/add_proto_validation
...
add proto validation at parse
2014-06-03 03:55:41 +03:00
70b778751e
Merge pull request #6153 from vishh/stats1
...
Add per cpu usage to libcontainer stats
2014-06-02 17:53:17 -07:00
4e7254840b
Add redirect and env proxy support to docker login
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-03 00:46:06 +00:00
98d7b720c2
Merge pull request #6169 from vieux/add_volumes_inspect_back
...
add volumes back to inspect
2014-06-02 17:07:00 -07:00
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
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
b292928cd5
Merge pull request #5848 from unclejack/resumable_pulls
...
resume pulling the layer on disconnect
2014-06-02 14:07:01 -07:00
dcba54aa99
Merge pull request #6166 from vieux/debug_skipping
...
switch skipping from error to debug
2014-06-02 14:01:49 -07:00
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
Chris Alfonso
Ian Main
Michael Crosby
kies
Sven Dowideit
Chris Snow
Victor Vieux
Victor Vieux
Tibor Vass
Joe Beda
unclejack
Michael Crosby
unclejack
Matthew Heon
SvenDowideit
James Turnbull
Vincent Batts
Sam Bailey
Albert Zhang
Alexander Larsson
Zac Dover
Tianon Gravi
Victor Marmol