James Turnbull
4092b1735f
Merge pull request #6182 from mheon/fix_manpage_issue
...
Clarify manpages on docker start
Upstream-commit: 19ef3ff1126be62c6dcb0a24a797a09ad251e5bb
Component: engine
2014-06-05 15:15:50 -07:00
Sven Dowideit
429e3bef53
Merge pull request #6219 from cpuguy83/fix_ssh_example_docs_root_login
...
Fixes broken ssh server example
Upstream-commit: a2c553bd6bb223fb5449f9875a8e2f40abb14994
Component: engine
2014-06-05 15:02:43 -07:00
Sven Dowideit
6d3f7f2239
Merge pull request #6222 from SvenDowideit/pr_out_reflow_to_80_columns
...
Initial edits to home page
Upstream-commit: 64ce33268cda1210017f0a226846b004616e0915
Component: engine
2014-06-05 14:58:29 -07:00
SvenDowideit
cefcc5a5b7
reflow to 80 columns
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: abcb724ed90a1e68234bd9c1c0d9263557b67026
Component: engine
2014-06-06 07:58:05 +10:00
Fred Lifton
ccac994016
Initial copy edits to home page.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: SvenDowideit)
Upstream-commit: 09b19752e028f91644e3e2801f0fd616c4adc683
Component: engine
2014-06-06 07:58:04 +10:00
Sven Dowideit
87c7a13363
Merge pull request #6223 from jamtur01/rl
...
Revert "Initial links for Docker Hub rename"
Upstream-commit: 6be75947abd788773ae02ffd9e2a4dd7dcd3e871
Component: engine
2014-06-05 14:56:12 -07:00
James Turnbull
1492ef2c06
Revert "Initial links for Docker Hub rename"
...
This reverts commit 2819677c215bd409b4ce4da51f0ddfb303760796.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: fad14eda3af8b4ffa59f74dc5c6583d22bcc9471
Component: engine
2014-06-05 14:52:06 -07:00
James Turnbull
a0d36a9d79
Merge pull request #6156 from jamtur01/links
...
Initial link update for Docs
Upstream-commit: 6fa3acc96c2d39c75193f140c5ed2e654cc77208
Component: engine
2014-06-05 14:46:33 -07:00
Victor Vieux
bd1ced896d
Merge pull request #6220 from vieux/fix_redirect
...
Only forward auth to trusted locations
Upstream-commit: cedab4d06a6e74d6567799ac4ad494884a8a9b13
Component: engine
2014-06-05 14:34:37 -07:00
Victor Vieux
51ac70314e
only forward auth to trusted locations
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: a12453186323372f4d4e23980d3f1caa2de91e5a
Component: engine
2014-06-05 19:47:33 +00:00
Matthew Heon
cdfc620fa1
Clarify effect of docker start on started container in CLI docs
...
This behavior changed from v0.9 to v0.10, so document it to prevent
any confusion.
Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com > (github: mheon)
Upstream-commit: d08c965e2c6ed223e10773ac77f95b7b6e273e0a
Component: engine
2014-06-05 15:08:54 -04:00
cpuguy83
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
Sven Dowideit
af0d43a64a
Merge pull request #6215 from cpuguy83/fix_volumes_from_api_doc
...
Fixes incorrect API spec for items moved to HostConfig
Upstream-commit: 734d108ed244b34a1111d864dc9b53046e3dc0ec
Component: engine
2014-06-05 10:33:16 -07:00
cpuguy83
81d8873d1e
Fixes incorrect API spec for items moved to HostConfig
...
DNS and VolumesFrom were moved to HostConfig and as such are part of the
container start and not create.
For some reason 0.10 docs are correct (except for a missing quote in the
JSON") but 0.11 and latest are not.
Docker-DCO-1.1-Signed-off-by: cpuguy83 <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: 8c646ebf16bd0e2618cbca430bc129ee7416a21c
Component: engine
2014-06-05 09:50:27 -04:00
Victor Vieux
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
Victor Vieux
1040100018
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
Upstream-commit: fe706af3c0569f378dab454b6083b91ea57be84d
Component: engine
2014-06-04 18:31:55 -07:00
Tibor Vass
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
Tibor Vass
e9e3cbb2bd
Merge pull request #6208 from crosbymichael/remove-insert
...
Totally remove insert feature
Upstream-commit: 894814f708a324af97370cf576d1d09a53d87480
Component: engine
2014-06-04 18:17:23 -07:00
Victor Marmol
d5a48cabdd
Merge pull request #1 from crosbymichael/nsenter-path
...
Move environment loading to nsenter
Upstream-commit: a0137e104ce6789f64baa1eecbcd625ed5cac9cb
Component: engine
2014-06-04 18:14:12 -07:00
Michael Crosby
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
Michael Crosby
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
Victor Marmol
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
Michael Crosby
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
Michael Crosby
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
James Turnbull
a1eeb95682
Initial links for Docker Hub rename
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 2819677c215bd409b4ce4da51f0ddfb303760796
Component: engine
2014-06-04 16:48:49 -07:00
Victor Vieux
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
Michael Crosby
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
Michael Crosby
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
unclejack
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
Michael Crosby
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
unclejack
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
Vishnu Kannan
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
Chris Alfonso
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
Ian Main
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
Michael Crosby
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
kies
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
Sven Dowideit
f064a81ba0
Merge pull request #6191 from snowch/patch-1
...
Small clarification
Upstream-commit: 9f14ff83b2e8cba9a1396c02aa3934373d58b274
Component: engine
2014-06-04 01:56:01 -07:00
Chris Snow
07bf3a87a8
Update builder.md
...
Upstream-commit: 2e14f0f70af2ce152b531f02c4fce363b6605e37
Component: engine
2014-06-04 08:08:44 +01:00
Victor Vieux
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
Victor Vieux
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
Tibor Vass
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
unclejack
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
Victor Vieux
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
Victor Vieux
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
Michael Crosby
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
unclejack
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
Sven Dowideit
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
unclejack
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
Matthew Heon
8e81ab409a
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)
Upstream-commit: d96eb47dee10a059436b4d4cf285db1d70468e26
Component: engine
2014-06-03 17:10:59 -04:00
SvenDowideit
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