15bbcd7308
Fixes broken ssh server example
...
Docker-DCO-1.1-Signed-off-by: cpuguy83 <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: 04620e01547d6526023b49494919f3eb3fcf900a
Component: engine
2014-06-05 14:10:52 -04:00
10c138b211
Merge pull request #6026 from vmarmol/nsenter
...
Adding initial version of C-based nsenter for allowing execin in libcontainer.
Upstream-commit: 7e96f8de1c65d414dd2c5039bf5953ae10cf236f
Component: engine
2014-06-04 19:06:27 -07:00
d0a1649e4a
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)
Upstream-commit: 0d1906feea511cbfd1695adbb0b39dfdfae2caeb
Component: engine
2014-06-04 18:30:10 -07:00
f1a3b9e98b
Exclude the user namespace for setns
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 7eb508633db93213404292bd4fd21b6855f45bea
Component: engine
2014-06-04 18:03:17 -07:00
a3fd3c7cb6
Move env load to nsenter
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 8497d1274b046804999699ccb66b11a3249906a1
Component: engine
2014-06-04 17:54:00 -07:00
f1f202bb40
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)
Upstream-commit: 0a725ea28259f8a0f9a1de5730fd99675b942dde
Component: engine
2014-06-05 00:44:13 +00:00
e29c2c6bde
Totally remove insert feature
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 7a145b022a3b50b0d04cb0471d517f7c6c5efc67
Component: engine
2014-06-04 17:35:15 -07:00
d46eb5164f
Merge pull request #6205 from crosbymichael/rename-namespaces
...
Rename nsinit package to namespaces in libcontainer
Upstream-commit: a8ef66d84a33aa719bc2af8c4f07230913112e40
Component: engine
2014-06-04 17:27:45 -07:00
c4f9e05e7e
Merge pull request #6204 from crosbymichael/no-structs
...
Remove the API container struct and use env
Upstream-commit: aa05170a82a857aa6f1257d4554828c08c2015f6
Component: engine
2014-06-04 16:40:20 -07:00
e9b3abdfc5
Rename nsinit package to namespaces in libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 8aff01c0b447fa4d68f053c44e8baf7b24247164
Component: engine
2014-06-04 15:47:57 -07:00
5f73b1bc4e
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)
Upstream-commit: 91757eaeb3523679b30afee61c1dede33c8664c9
Component: engine
2014-06-04 15:37:49 -07:00
165554f7ab
Merge pull request #6178 from calfonso/freezer-pr-integration
...
Freezer integration to support container pause/unpause
Upstream-commit: 048833c246e793f8ce5256cc9db17aad758432e3
Component: engine
2014-06-05 01:29:47 +03:00
fac037791f
Merge pull request #6198 from vishh/stats2
...
Add more stats to libcontainer.
Upstream-commit: fd21da4b0b91becf491d753549e9a5f7158aebbd
Component: engine
2014-06-04 15:28:19 -07:00
0a81434b1b
Merge pull request #6195 from kieslee/master
...
pass address of metaHeaders to GetenvJson in ImagePush and ImagePull
Upstream-commit: 597c06ca34377c1a6b362fa622ba275cbea3d339
Component: engine
2014-06-05 00:23:08 +03:00
d17e332286
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)
Upstream-commit: 8d63b610c39eb34b06f275b507c482460015531e
Component: engine
2014-06-04 21:20:21 +00:00
0fc07e0aef
Integrating systemd freeze functionality.
...
This pulls together #6061 and #6125
Docker-DCO-1.1-Signed-off-by: Chris Alfonso <calfonso@redhat.com > (github: calfonso)
Upstream-commit: 26246ebd5379a83b2ed656668bd985c652e98167
Component: engine
2014-06-04 13:33:44 -06:00
77114664a4
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)
Upstream-commit: b054569cde788b2111ddbc4080b215dcda89f06e
Component: engine
2014-06-04 13:33:44 -06:00
d0dbff4e5f
Merge pull request #6187 from vieux/wait_freeze
...
Implement wait on freeze
Upstream-commit: 1f5b3232082d80a32b52ffa3618e36eb70a8bb98
Component: engine
2014-06-04 12:00:20 -07:00
a0957a5314
pass address of metaHeaders to GetenvJson in ImagePush and ImagePull
...
Docker-DCO-1.1-Signed-off-by: kies <lleelm@gmail.com > (github: kieslee)
Upstream-commit: eb3e2f4f4736eaaab260804ff8543fb77243a254
Component: engine
2014-06-04 17:54:06 +08:00
07bf3a87a8
Update builder.md
...
Upstream-commit: 2e14f0f70af2ce152b531f02c4fce363b6605e37
Component: engine
2014-06-04 08:08:44 +01:00
0f498972d9
Merge pull request #6082 from FLGMwt/2342-change-wording-uploading-context
...
Change 'Uploading context' wording
Upstream-commit: 3704996089822f3df82c4b5441624418b7e3341d
Component: engine
2014-06-03 23:58:20 -07:00
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
ba5ca66eca
Merge pull request #6186 from unclejack/fix_typo_aufsgo
...
fix diffs->diff typo in aufs.go
Upstream-commit: 2a92c53a060685f3d719c703f7b6287537ba7852
Component: engine
2014-06-03 16:59:43 -07:00
974c92338e
fix diffs->diff typo in aufs.go
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 7a60b9063c109892f60165adb71682988d39d3d8
Component: engine
2014-06-04 02:46:55 +03: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
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
