1860a31aef
Fix unmount when host volume is removed
...
Fixes #5244
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 39103e72a3ca4ff739a4986c4e4849339e08aaf3
Component: engine
2014-04-14 12:43:01 +00:00
2ab96284b5
Merge pull request #5227 from SvenDowideit/fix-conversion-urls-securityblog
...
rst->md conversion fix
Upstream-commit: 24c4c3e0e99ddb4d65200f2f7367883e47008898
Component: engine
2014-04-16 13:11:29 +03:00
20f9c08a40
rst->md conversion fix
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: ce7d251d520443228d5058f4fa9185b2f7e7b075
Component: engine
2014-04-16 14:43:52 +10:00
927cbbfeb1
Merge pull request #5204 from ostezer/new-maintainer
...
Adding myself to the MAINTAINERS
Upstream-commit: 9b6c40cf69e048a5a23fc9a20b0fe7224d60d8ea
Component: engine
2014-04-15 21:19:39 -07:00
b169931da8
Merge pull request #5224 from dhrp/tp-titles-colors
...
Changed heading colors and some alignments (no longer center and justification in left column)
Upstream-commit: 8e35bb256d07bfa7e6374759baf9c081fe6a46a8
Component: engine
2014-04-16 13:07:52 +10:00
4d9a02a306
Changed heading colors and some alignments (no longer center and justification in left column)
...
Docker-DCO-1.1-Signed-off-by: Thatcher Peskens <thatcher@docker.com > (github: dhrp)
Upstream-commit: 4d3e448a33f87ed18def8f4ee7a01ef66bc6549e
Component: engine
2014-04-15 19:15:13 -07:00
a8d6e0c894
Merge pull request #5219 from dotcloud/master-doc-markdown
...
now, with shiney markdown
Upstream-commit: b9f66049fa4d0dc2cdc0a430fe14029214456611
Component: engine
2014-04-16 11:05:29 +10:00
c4684e29f0
now, with shiney markdown
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: ac999a9cb2b0976e021aeb8825bb051df6bd0976
Component: engine
2014-04-16 11:04:14 +10:00
5c2b3f3f64
move the documentation to markdown
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: a777ebcee6326bed2f7e99eedf6edbb922175e2d
Component: engine
2014-04-16 11:04:01 +10:00
c9de801094
Merge pull request #5206 from SvenDowideit/stage-markdown
...
move the documentation to markdown
Upstream-commit: ede9ea37c39d52b12bb7d773070fa73219505f10
Component: engine
2014-04-16 10:08:57 +10:00
0bb55ea3f4
move the documentation to markdown
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: )
Upstream-commit: 936a03bfddb24cd45f5f12c20a961bf2ae6ede93
Component: engine
2014-04-16 00:02:10 +00:00
d4a731f106
Adding myself to the MAINTAINERS file.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: 32d8b5da5080cf4ef9f27636d1ee52c8b79eb890
Component: engine
2014-04-16 00:33:14 +03:00
388b678ba2
Merge pull request #5211 from crosbymichael/update-cgroup-defaults
...
Ignore not exist errors for joining default subsystems
Upstream-commit: 80f6b011328ad81fdf68d073b4dc771ec21cba23
Component: engine
2014-04-15 22:55:26 +03:00
ede836d1af
Merge pull request #5201 from tianon/build-busybox
...
Fetch the "busybox" image source so we can build locally instead of pulling during the integration tests
Upstream-commit: 994b7eaeb736c745442cae84126e30fa079e3dfe
Component: engine
2014-04-15 09:47:05 -06:00
57da9f5a5d
Merge pull request #5181 from uggedal/mkimage-alpine
...
contrib: mkimage script for alpine linux
Upstream-commit: de167a75145a52f2099cab342c237c191b7db478
Component: engine
2014-04-15 08:09:42 -06:00
32c2479f3c
Merge pull request #5202 from vieux/allow_dot_repo
...
Allow dot in repo name
Upstream-commit: 8b54e57fa81b55d0fd42935505734719a348d6cf
Component: engine
2014-04-15 13:58:33 +03:00
80f4de5d30
contrib: mkimage script for alpine linux
...
Docker-DCO-1.1-Signed-off-by: Eivind Uggedal <eivind@uggedal.com > (github: uggedal)
Upstream-commit: 6a2bdc6eb769ffd1d8438f321953dde8b341b783
Component: engine
2014-04-15 07:59:42 +00:00
680490e66c
allow dot in repo name
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: d61fce9af770f0adaf4f178a5217dd46a02dd201
Component: engine
2014-04-14 23:15:38 +00:00
abb1fb2274
Fetch the "busybox" image source so we can build locally instead of pulling during the integration tests
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 7bb72fa080d13c3b90d624cb77530632c7705c56
Component: engine
2014-04-14 13:35:54 -06:00
2355a3647b
Merge pull request #5158 from vieux/refactor_build_only_configFile
...
refactor build job to know only configFile
Upstream-commit: e5ad715e5964bc64e098070d1ca72b110c337d1a
Component: engine
2014-04-14 10:59:48 -07:00
feaba75b7b
Merge pull request #5075 from tianon/update-check-config
...
Update check-config.sh with more kernel configs and more reliable cgroup hierarchy/subsystem check
Upstream-commit: 19ffc5e92f5ddfc197890b0bc6a51187d0fd1916
Component: engine
2014-04-14 10:58:00 -07:00
0ac428f052
Merge pull request #5132 from crosbymichael/fix-cgroup-hiar
...
Setup cgroups for supported subsystems
Upstream-commit: 5fc1b4d2cd76cb0d04f66c85424d54408e70037f
Component: engine
2014-04-14 10:56:15 -07:00
156fab79f3
Merge pull request #4878 from kzys/freebsd-utimes
...
Support FreeBSD on pkg/system/utimes_*.go
Upstream-commit: f98ed28c1dd5766cb8c80f32418f13878df29e6c
Component: engine
2014-04-14 10:39:25 -07:00
1d8323fa8e
Merge pull request #5172 from pnasrat/5166-large-image-graph-restore
...
Enable construction of TruncIndex from id array.
Upstream-commit: 413190e1590740ee4fd1886a8c250979df3076eb
Component: engine
2014-04-14 10:31:16 -07:00
51ab1031ea
rename configFile to auth in the job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: e9c3e397436221528312c0d3b291ae5a12862ed2
Component: engine
2014-04-14 17:15:22 +00:00
01872204ed
Merge pull request #5160 from kzys/fs-symlink
...
Fix utils.FollowSymlinkInScope's infinite loops bug
Upstream-commit: 0037dee02cdfec3a495e4fc797393248ed3e4bec
Component: engine
2014-04-14 20:12:39 +03:00
ab0b17d0d0
Merge pull request #4828 from almoehi/patch-1
...
Added reactive-docker to list of remote API clients
Upstream-commit: b255d96694e561fd2ed5b1a5c45b7cdc01af7ffb
Component: engine
2014-04-14 19:06:59 +03:00
936bcbbb79
Add benchmark tests for TruncIndex.
...
Compare add vs new.
Some historical data in PR #5172 .
Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com > (github: pnasrat)
Upstream-commit: 84a76f27962d4f4b3871abe925ca17024bdeea73
Component: engine
2014-04-13 22:36:15 -04:00
fbaa43b382
Ignore not exist errors for joining default subsystems
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 184728e7bcf9af3224f53e8d5d38d44b08de24ec
Component: engine
2014-04-14 00:07:48 +00:00
20850020f5
Merge pull request #5176 from unclejack/check_before_pulling
...
cli integ: don't fetch busybox if it exists
Upstream-commit: 2d20c92d29775f9c4c2fff3c4809d507138e1523
Component: engine
2014-04-13 09:28:30 -06:00
103b32014b
cli integ: don't fetch busybox if it exists
...
Don't make calls to the registry if the image exists already.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 449f92f11ed34d4475fa24e2561b02cc263722bf
Component: engine
2014-04-13 15:06:15 +03:00
031e906716
Merge pull request #5177 from jbbarth/docs-add-common-errors-for-test-suite
...
Docs: add some example log lines that indicate a lack of memory when running the test suite
Upstream-commit: 370b935b4987c79eec769b0cc3788726a3f8abc9
Component: engine
2014-04-12 21:03:24 +03:00
4df48cc2f4
Merge pull request #5178 from jbbarth/docs-improve-ubuntulinux-accounting-section
...
Docs: improve installation/ubuntulinux memory and swap accounting section
Upstream-commit: 1f7e97e951b32cc804f627257f3955263d4dfbbd
Component: engine
2014-04-12 20:32:26 +03:00
2cd55701e9
Docs: improve installation/ubuntulinux memory and swap accounting section
...
Docker-DCO-1.1-Signed-off-by: Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com > (github: jbbarth)
Upstream-commit: 0a0e49d406d10ce7c79952c78162768dd05ee875
Component: engine
2014-04-12 10:57:19 +00:00
8d072a85fc
Docs: add some example log lines that indicate a lack of memory when running the test suite
...
Docker-DCO-1.1-Signed-off-by: Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com > (github: jbbarth)
Upstream-commit: 26845ef1ae97be3904b2fd85fa06f9a97ccee67c
Component: engine
2014-04-12 02:09:06 +00:00
d4a5ca9f47
Fix utils.FollowSymlinkInScope's infinite loop bug
...
fs_test.go doesn't finish if Docker's code is placed under a directory
which has symlinks between / and the directory.
For example, the below doesn't finish before the change.
/home -> usr/home
FollowSymlinkInScope("/home/bob/foo/bar", "/home/bob/foo")
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
Upstream-commit: 0f724863468733847306f47835739f480a7fac63
Component: engine
2014-04-12 07:37:18 +09:00
82b2213679
Add the test to reproduce the issue even in "make test"
...
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
Upstream-commit: e3e078ca2fc4ce76461a40533add9f33afcd1abe
Component: engine
2014-04-12 07:37:17 +09:00
74f0d78beb
Enable construction of TruncIndex from id array.
...
Fixes #5166
Current graph.restore is essentially O(n^2 log n) due to how
suffixarray creation works.
Rather than create/append/create new this supports creation from a seed
array of ids.
Functional testing shows this eliminates the hang on Creating image
graph reported on list.
Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com > (github: pnasrat)
Upstream-commit: 4f169c2db512d2ea9ed5729df375896a1ee90347
Component: engine
2014-04-11 16:39:58 -04:00
5b7c5b263f
Join memory and cpu cgroup in systemd too
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: crosbymichael)
Upstream-commit: 4ddfffcab3edf3d05ee8319e87410fe747979a04
Component: engine
2014-04-11 17:29:40 +00:00
9ba641b0ce
Join cpuacct, freezer, perf_event, and blkio groups
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 505184d2dcb5d21834bcb2b108564fbdab733953
Component: engine
2014-04-11 17:28:27 +00:00
b455526c28
Setup cgroups for all subsystems
...
Fixes #5117
Fixes #5118
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 031fcb31d3a81fbd5c5ab8d898d53fbd486413e6
Component: engine
2014-04-11 17:28:27 +00:00
6e58c978fc
Merge pull request #5164 from jsimonelis/patch-2
...
terms update: FQIN must include a tag
Upstream-commit: 931f0655606b14ef6fab1952d442691d1007f6ef
Component: engine
2014-04-11 06:47:28 -07:00
575a5da6a2
terms update: FQIN must include a tag
...
change: A fully qualified image name must include a tag.
Recommitting changes for PR: https://github.com/dotcloud/docker/pull/5145
since SvenDowideit suggested I would need to sign my commit for it to be accepted.
Docker-DCO-1.1-Signed-off-by: Justin Simonelis <justin.p.simonelis@gmail.com > (github: jsimonelis)
Upstream-commit: 69fbf8e31f0b74c61c7e7fe1bd34bbb1aaf813b6
Component: engine
2014-04-11 08:51:50 -04:00
f3aecbde7d
refactor build job to know only configFile
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: b9731bccf2b2cc8c06ef8bdb41f72ca4791e63db
Component: engine
2014-04-10 22:29:03 +00:00
3b78fa93c6
Merge pull request #5072 from tianon/hack-set-e-consistently
...
Update bundlescripts to use "set -e" consistently
Upstream-commit: 28e7e814795fce2a75e4767a6707a6e4d03fa8b6
Component: engine
2014-04-10 13:37:36 -06:00
7d2033488c
Merge pull request #5071 from tianon/minor-man-formatting-consistency
...
Fix a few minor man formatting consistency issues
Upstream-commit: feae37c171e22f1d17cabe1559cd0262606d0e8d
Component: engine
2014-04-10 13:13:37 -06:00
403efcd6f1
Merge pull request #5093 from danielnorberg/do-not-create-bridge
...
net: do not create -b/--bridge specified bridge
Upstream-commit: f66082a4438f53a0cd9466e12aac324f5acaed64
Component: engine
2014-04-10 11:17:02 -07:00
a7fdc7bba3
Merge pull request #4990 from vbatts/vbatts-server_show_info
...
docker daemon: show info about the server
Upstream-commit: bcc3857fa0b283530469065d455027514743a1e2
Component: engine
2014-04-10 11:14:09 -07:00
4ea377c1c7
Merge pull request #5143 from kzys/ns-nil
...
Avoid "invalid memory address or nil pointer dereference" panic
Upstream-commit: b8c10d8af254a6200de642e246b5a0d9de0dfca8
Component: engine
2014-04-10 11:07:35 -07:00
a6fc08c279
Merge pull request #4821 from jimenez/3903-add_event_end_timestamp-feature
...
Adding timestamp end to events endpoint. Modifying api docs.
Upstream-commit: a521388863502014bdea80585b7272a854191244
Component: engine
2014-04-10 20:54:53 +03:00
