948e54ac45
devmapper: Fail init with ErrNotSupported if simple devmapper call fails
...
If we can't even get the current device mapper driver version, then
we cleanly fail the devmapper driver as not supported and fall back
on the next one.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-06-05 10:42:27 +02:00
13f07b636f
pkg/units: Add FromHumanSize
...
This does the "reverse" of HumanSize, i.e. maps a string to an int64
using SI prefixes for the extension.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-06-05 10:02:37 +02:00
7e96f8de1c
Merge pull request #6026 from vmarmol/nsenter
...
Adding initial version of C-based nsenter for allowing execin in libcontainer.
2014-06-04 19:06:27 -07:00
fe706af3c0
Merge pull request #6210 from tiborvass/fix_doc_remove_insert_remote_api
...
Move doc section in Remote API about removing insert from v1.11 to v1.12
2014-06-04 18:31:55 -07:00
0d1906feea
Move doc section in Remote API about removing insert from v1.11 to v1.12
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-06-04 18:30:10 -07:00
894814f708
Merge pull request #6208 from crosbymichael/remove-insert
...
Totally remove insert feature
2014-06-04 18:17:23 -07:00
a0137e104c
Merge pull request #1 from crosbymichael/nsenter-path
...
Move environment loading to nsenter
2014-06-04 18:14:12 -07:00
7eb508633d
Exclude the user namespace for setns
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-06-04 18:03:17 -07:00
8497d1274b
Move env load to nsenter
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-06-04 17:54:00 -07:00
0a725ea282
Adding initial version of C-based nsenter for allowing execin in
...
libcontainer.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
2014-06-05 00:44:13 +00:00
7a145b022a
Totally remove insert feature
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-06-04 17:35:15 -07:00
a8ef66d84a
Merge pull request #6205 from crosbymichael/rename-namespaces
...
Rename nsinit package to namespaces in libcontainer
2014-06-04 17:27:45 -07:00
aa05170a82
Merge pull request #6204 from crosbymichael/no-structs
...
Remove the API container struct and use env
2014-06-04 16:40:20 -07:00
8aff01c0b4
Rename nsinit package to namespaces in libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-06-04 15:47:57 -07:00
91757eaeb3
Remove the API container struct and use env
...
This change touches docker logs, attach, and start -a along with get
exit code in the client.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-06-04 15:37:49 -07:00
048833c246
Merge pull request #6178 from calfonso/freezer-pr-integration
...
Freezer integration to support container pause/unpause
2014-06-05 01:29:47 +03:00
fd21da4b0b
Merge pull request #6198 from vishh/stats2
...
Add more stats to libcontainer.
2014-06-04 15:28:19 -07:00
597c06ca34
Merge pull request #6195 from kieslee/master
...
pass address of metaHeaders to GetenvJson in ImagePush and ImagePull
2014-06-05 00:23:08 +03:00
8d63b610c3
Add stats for memory allocation failure count and instantaneous cpu usage in the usermode and kernelmode.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-06-04 21:20:21 +00:00
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
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
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
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
Alexander Larsson
Victor Vieux
Tibor Vass
Victor Marmol
Michael Crosby
Michael Crosby
unclejack
Vishnu Kannan
Chris Alfonso
Ian Main
kies
Sven Dowideit
Chris Snow
Victor Vieux
unclejack
SvenDowideit
James Turnbull
Vincent Batts
Zac Dover
Tianon Gravi