cpuguy83
04620e0154
Fixes broken ssh server example
...
Docker-DCO-1.1-Signed-off-by: cpuguy83 <cpuguy83@gmail.com > (github: cpuguy83)
2014-06-05 14:10:52 -04:00
Sven Dowideit
734d108ed2
Merge pull request #6215 from cpuguy83/fix_volumes_from_api_doc
...
Fixes incorrect API spec for items moved to HostConfig
2014-06-05 10:33:16 -07:00
cpuguy83
8c646ebf16
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)
2014-06-05 09:50:27 -04:00
Alexander Larsson
0434a2ce64
devmapper: Add blkdiscard option and disable it on raw devices
...
The blkdiscard hack we do on container/image delete is pretty slow, but
required to restore space to the "host" root filesystem. However, it
is pretty useless on raw devices, and you may not need it in development
either.
In a simple test of the devicemapper backend on loopback the time to
delete 20 container went from 11 seconds to 0.4 seconds with
--storage-opt blkdiscard=false.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-06-05 11:45:59 +02:00
Alexander Larsson
a226168a8b
devmapper: Add options for specifying block devices
...
This adds dm.datadev and dm.metadatadev options that you can use with
--storage-opt to set to specific devices to use for the thin
provisioning pool.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-06-05 11:45:55 +02:00
Alexander Larsson
807bc2cd04
devmapper: Allow specifying filesystem for thin devices
...
This adds the following --storage-opts for the daemon:
dm.fs: The filesystem to use for the base image
dm.mkfsarg: Add an argument to the mkfs command for the base image
dm.mountopt: Add a mount option for devicemapper mount
Currently supported filesystems are xfs and ext4.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-06-05 11:25:06 +02:00
Alexander Larsson
10083f4140
devicemapper: Probe what filesystem to use when mounting
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-06-05 11:03:19 +02:00
Alexander Larsson
7f5ba068f4
devmapper: Add --storage-opt options for basic devicemapper settings
...
This allows setting these settings to be passed:
dm.basesize
dm.loopdatasize
dm.loopmetadatasize
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-06-05 10:50:07 +02:00
Alexander Larsson
822ea97ffc
Add --storage-opt graph driver option and pass through to driver
...
This lets you add storage specific options for the daemon.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-06-05 10:42:27 +02:00
Alexander Larsson
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
Alexander Larsson
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
Victor Vieux
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
Victor Vieux
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
Tibor Vass
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
Tibor Vass
894814f708
Merge pull request #6208 from crosbymichael/remove-insert
...
Totally remove insert feature
2014-06-04 18:17:23 -07:00
Victor Marmol
a0137e104c
Merge pull request #1 from crosbymichael/nsenter-path
...
Move environment loading to nsenter
2014-06-04 18:14:12 -07:00
Michael Crosby
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
Michael Crosby
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
Victor Marmol
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
Michael Crosby
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
Michael Crosby
a8ef66d84a
Merge pull request #6205 from crosbymichael/rename-namespaces
...
Rename nsinit package to namespaces in libcontainer
2014-06-04 17:27:45 -07:00
James Turnbull
2819677c21
Initial links for Docker Hub rename
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-06-04 16:48:49 -07:00
Victor Vieux
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
Michael Crosby
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
Michael Crosby
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
unclejack
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
Michael Crosby
fd21da4b0b
Merge pull request #6198 from vishh/stats2
...
Add more stats to libcontainer.
2014-06-04 15:28:19 -07:00
unclejack
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
Vishnu Kannan
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
Chris Alfonso
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
Ian Main
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
Michael Crosby
1f5b323208
Merge pull request #6187 from vieux/wait_freeze
...
Implement wait on freeze
2014-06-04 12:00:20 -07:00
kies
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
Sven Dowideit
9f14ff83b2
Merge pull request #6191 from snowch/patch-1
...
Small clarification
2014-06-04 01:56:01 -07:00
Chris Snow
2e14f0f70a
Update builder.md
2014-06-04 08:08:44 +01:00
Victor Vieux
3704996089
Merge pull request #6082 from FLGMwt/2342-change-wording-uploading-context
...
Change 'Uploading context' wording
2014-06-03 23:58:20 -07:00
Victor Vieux
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
Tibor Vass
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
unclejack
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
Victor Vieux
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
Victor Vieux
37d69aae5e
Merge pull request #6180 from unclejack/apparmor
...
apparmor: write & load the profile on every start
2014-06-03 15:56:28 -07:00
Michael Crosby
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
unclejack
a2ec8fa1db
Merge pull request #6181 from SvenDowideit/change-out-port-number
...
IANA allocated Docker port: 2375
2014-06-04 01:07:48 +03:00
Sven Dowideit
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
unclejack
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
Matthew Heon
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
SvenDowideit
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
James Turnbull
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
Victor Vieux
2f514fb891
Merge pull request #6125 from crosbymichael/systemd-freezer
...
Implement systemd support for freezer
2014-06-03 11:39:21 -07:00
Sven Dowideit
7f55d92837
Merge pull request #6173 from zdover23/03_Jun_2014
...
grammar; nothing big (added a "the")
2014-06-03 10:48:20 -07:00