Commit Graph
12265 Commits
Author SHA1 Message Date
Sven Dowideit 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
Sven Dowideit 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
Sven Dowideit 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
Sven Dowideit 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
Dan McPherson 0a38627cf3 Fixing typos
Docker-DCO-1.1-Signed-off-by: Dan McPherson <dmcphers@redhat.com> (github: danmcp)
Upstream-commit: dceea17805258520b1218eb1a2bb394c8b9c0a03
Component: engine
2014-04-15 18:06:48 -04:00
O.S.Tezer 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
unclejack 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
Tianon Gravi 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
Kato Kazuyoshi f555d1ef2b Support FreeBSD on pkg/mount
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
Upstream-commit: 3754fdd7caae423b606c6fb5160683534a830a1a
Component: engine
2014-04-15 23:16:51 +09:00
Tianon Gravi 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
unclejack 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
Eivind Uggedal 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
Victor Vieux 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
Kato Kazuyoshi d6c3caff98 FreeBSD's nullfs doesn't support file mount
FreeBSD doesn't have "bind" mount, but nullfs might be a similar feature.
However nullfs can mount only directories.

Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
Upstream-commit: ca7a0e6d6e31c02baf692315d2481ef35a7e9134
Component: engine
2014-04-15 05:40:23 +09:00
Kato Kazuyoshi 6514818ece Add a test for mount.GetMounts
Because mount.parseInfoFile is only available on Linux

Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
Upstream-commit: a7e181c8576e0413da888bea95fb7155173714ea
Component: engine
2014-04-15 05:40:23 +09:00
Tianon Gravi 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
Guillaume J. Charmes 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
Guillaume J. Charmes 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
Victor Vieux 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
Guillaume J. Charmes 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
Michael Crosby 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
Victor Vieux 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
unclejack 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
O.S. Tezer 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
Michael Crosby 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
Michael Crosby c523a86079 Remove ArgsAsString because its a util function
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 9bd7d09871d8495d06af94a8d866404569d75b8e
Component: engine
2014-04-14 07:08:54 +00:00
Michael Crosby f02d8ea2c4 Fix resolvconf logic
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 35a88f2c291c882e49f7c448c1581dfdd3e35a9c
Component: engine
2014-04-14 06:58:04 +00:00
Michael Crosby 757f2fd1a0 Remove container.When method
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 71b241cbfe5b0100ee2ee0fd0e651beccd965746
Component: engine
2014-04-14 06:54:40 +00:00
Michael Crosby f2bd1e6d7d Refactor container start to make it more manageable
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: c99ba05c844d4099b85c653edc0c0f5122ccb522
Component: engine
2014-04-14 06:46:34 +00:00
Michael Crosby 55d539294f Move network settings into separate file
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f00ca72baa6c43de35d622caa728587a752d6e5e
Component: engine
2014-04-14 06:15:31 +00:00
Michael Crosby d953b1e434 Generate imports based on what is avaliable
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 3061a6a2ab0395c626f9acaa2e5d9c17152b0475
Component: engine
2014-04-14 05:22:45 +00:00
Paul Nasrat 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
Michael Crosby 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
Michael Crosby 4b3fd1c81f Ignore is not exist error
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 6c26a87901d12188dfd9986d9211f6077a286f9d
Component: engine
2014-04-14 00:03:35 +00:00
Michael Crosby ebb2ad0565 Move apparmor to top level pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 052cc5a6378ee4bbe1ef79e5632e2439d68ddbde
Component: engine
2014-04-13 23:33:25 +00:00
Michael Crosby b85f5791ad Use apparmor_parser directly
The current load script does alot of things.  If it does not find the
parser loaded on the system it will just exit 0 and not load the
profile.  We think it should fail loudly if it cannot load the profile
and apparmor is enabled on the system.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 5f4bc4f916f433a4ba258980a6c2fbdbd76d64f3
Component: engine
2014-04-13 23:31:10 +00:00
Tianon Gravi 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
unclejack 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
O.S. Tezer 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
O.S. Tezer 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
Jean-Baptiste Barth 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
Jean-Baptiste Barth 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
Kato Kazuyoshi 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
Kato Kazuyoshi 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
Paul Nasrat 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
Alexander Larsson 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
Michael Crosby 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
Michael Crosby 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
James Turnbull 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
Justin Simonelis 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