William Henry and Erik Hollensbe
943ce0ecc6
Fixed a sentence for ostezer.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
modified: contrib/man/md/README.md
Upstream-commit: 7922e67870a393417c88c2d27f0e8fac47e4596e
Component: engine
2014-04-21 10:42:46 -07:00
William Henry and Erik Hollensbe
aaa3eed5ae
Made some edits and removed the alternative, manual generation instructions.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
Changes to be committed:
modified: contrib/man/md/README.md
Upstream-commit: 95c311c8b4c63d81792c8683da677b790edf4000
Component: engine
2014-04-21 10:42:46 -07:00
William Henry and Erik Hollensbe
8b619b4b65
Edits based on ostezer's feedback.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
Upstream-commit: 1b2b783b52d76c7dae2958e6c53dcc3e665cd2fb
Component: engine
2014-04-21 10:42:46 -07:00
Tianon Gravi and Erik Hollensbe
221acbe18c
Update hack/make/ubuntu to use the new markdown-based manpages
...
This also removes all the old man pages, .gitignores their directory, and updates the md2man-all.sh script to be easier to read and more friendly to being called within hack/make/ubuntu.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: e55ed741c24fe9e974d08f4893c79752fb279dc4
Component: engine
2014-04-21 10:42:46 -07:00
William Henry and Erik Hollensbe
e297e06a1e
Added a tag to FROM fedora (fedora:20)
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
Upstream-commit: 67a73917c10bfaa265698f3bb054f9af43c61d5d
Component: engine
2014-04-21 10:42:46 -07:00
William Henry and Erik Hollensbe
7c5451c8cf
Created all manual pages in Markdown. Container for conversion.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
All Docker commands have a Markdown page.
Dockerfile used to build a Fedora based pandoc container.
md2man-all.sh is used inside the container.
README.sh includes an explaination on how to build the fedora/pandoc
image and how to run the container directly.
Changes to be committed:
new file: contrib/man/md/Dockerfile
new file: contrib/man/md/README.md
new file: contrib/man/md/docker-attach.md
new file: contrib/man/md/docker-build.md
new file: contrib/man/md/docker-commit.md
new file: contrib/man/md/docker-cp.md
new file: contrib/man/md/docker-diff.md
new file: contrib/man/md/docker-events.md
new file: contrib/man/md/docker-export.md
new file: contrib/man/md/docker-history.md
new file: contrib/man/md/docker-images.md
new file: contrib/man/md/docker-import.md
new file: contrib/man/md/docker-info.md
new file: contrib/man/md/docker-inspect.md
new file: contrib/man/md/docker-kill.md
new file: contrib/man/md/docker-load.md
new file: contrib/man/md/docker-login.md
new file: contrib/man/md/docker-logs.md
new file: contrib/man/md/docker-port.md
new file: contrib/man/md/docker-ps.md
new file: contrib/man/md/docker-pull.md
new file: contrib/man/md/docker-push.md
new file: contrib/man/md/docker-restart.md
new file: contrib/man/md/docker-rm.md
new file: contrib/man/md/docker-rmi.md
new file: contrib/man/md/docker-run.md
new file: contrib/man/md/docker-save.md
new file: contrib/man/md/docker-search.md
new file: contrib/man/md/docker-start.md
new file: contrib/man/md/docker-stop.md
new file: contrib/man/md/docker-tag.md
new file: contrib/man/md/docker-top.md
new file: contrib/man/md/docker-wait.md
new file: contrib/man/md/docker.md
new file: contrib/man/md/md2man-all.sh
Upstream-commit: 0a0dd1163294bfa92f37c41289e697f0ee4d9747
Component: engine
2014-04-21 10:42:46 -07:00
Guillaume J. Charmes
27e5f687ba
Merge pull request #5232 from kzys/freebsd-graph
...
Fix graph and pkg/graphdb on FreeBSD
Upstream-commit: 3c50cb44d186ccaf9edc85cad0f91917516ff07c
Component: engine
2014-04-21 10:39:50 -07:00
Guillaume J. Charmes
1ea14534fa
Merge branch 'master' into load-profile
...
Conflicts:
daemon/execdriver/native/create.go
daemon/execdriver/native/driver.go
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: 813cebc64fb4b628e2938405d86144060c330eb9
Component: engine
2014-04-21 10:32:13 -07:00
Guillaume J. Charmes
eec18ea747
Make sure @proc is defined
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: ac814ee3c76a3851d361e8dddfed7ac93ddf10e2
Component: engine
2014-04-21 10:28:04 -07:00
Michael Crosby
7aff9b75c9
Use cgo to get systems clock ticks for metrics
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 004cf556e86a03d8961416b3e8a0a476a424b10f
Component: engine
2014-04-21 10:26:22 -07:00
O.S. Tezer
04ef09fe01
Merge pull request #5321 from SvenDowideit/osx-install-mkdir-local
...
Merged.
Upstream-commit: d4ca1658275f5dc01dfc0f5af64b2e680e922cf2
Component: engine
2014-04-21 19:12:36 +03:00
Michael Crosby
f2dbe8f1d1
Refactor stat parsing to use only 8 fields
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: f59be989dc92503f29aa94ebf9ea4097ec28b8c9
Component: engine
2014-04-20 20:45:08 -07:00
Michael Crosby
61708fc6ce
Merge pull request #24 from ehazlett/cgroups-stats
...
more work on cpu stats
Upstream-commit: 9cd6a6d6142f3a2623a74187a90487b5a4dae6c8
Component: engine
2014-04-20 21:11:11 -07:00
Evan Hazlett
3973334e17
work on cpu stats
...
Docker-DCO-1.1-Signed-off-by: Evan Hazlett <ejhazlett@gmail.com > (github: ehazlett)
Upstream-commit: 2f24b5a9dcc9ca5da07563fb0dd381e49ed844cc
Component: engine
2014-04-21 00:07:05 -04:00
Michael Crosby
d5fdf0aaaa
Add freezer stats
...
This one is a problem because the most useful stat is a string and not a
float like verything else. We may have to change the return type
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: bce49dff0d46dec620e755ed859efa791054a843
Component: engine
2014-04-20 18:35:33 -07:00
Michael Crosby
a0be7fcb46
Reuse cpuacct stats for cpu subsystem
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 3bfe13de2c38fda5b57e2499f474da701495c5ba
Component: engine
2014-04-20 18:20:44 -07:00
Michael Crosby
2f3e3558eb
Fix parsing of blkio files
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 37248039e186f57768bb5c4fad23b1bca65448f7
Component: engine
2014-04-20 18:18:17 -07:00
Michael Crosby
030a007d36
Add external function to get cgroup stats
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 7f12260fd13329f3bafe4b42ad4193ff963bb1e2
Component: engine
2014-04-20 17:36:20 -07:00
Michael Crosby
af2fbf289d
Refactor stats and add them to all subsystems
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 9b65f1635515fa35ed38f8a76b6d8f73ab3a1d02
Component: engine
2014-04-20 12:02:39 -07:00
Michael Crosby
1b76554adc
Squashed commit of the following:
...
commit 75af1649b063abbc5d662fd2f8bc4ff62c927687
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 01:32:42 2014 -0400
more refactor
commit 43b36d0f15d634497127bcb17dacaa70ae92e903
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 01:11:49 2014 -0400
refactored cgroup param parsing to util func
commit e3738b0168a075bd92ec828879b0e46bdbbe3845
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 00:57:19 2014 -0400
dat error checking
commit 57872bcc59403ecd308cfe97c78f73d6ca58d165
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 00:43:25 2014 -0400
proper use of fmt.Errorf
commit 43dad6acc0cb21aac2b04ce074699879898ee820
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 00:36:45 2014 -0400
proper placement of defer
commit b7f20b934b2bc92cd39397dbc608b77bff28493c
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 00:34:39 2014 -0400
defers, error checking, panic avoidance
commit 7a9a6ff267f8806dfe6676486f73fe89b72968fb
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 00:22:00 2014 -0400
data param to use container info instead of host
commit 0e0cf7309be1644687160d6519db792b23cd26e9
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 00:11:29 2014 -0400
added stats for cpuacct, memory, and blkio
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 86e34ce59fb7f6e6e284a33f2538bafdc9114c89
Component: engine
2014-04-20 11:34:28 -07:00
Lance Chen and Lance Chen
4690619ea9
Add missing blank lines in between list items
...
Lists with paragraphs as items need blank lines in between
items to generate correct layout.
Docker-DCO-1.1-Signed-off-by: Lance Chen <cyen0312@gmail.com > (github: Lance0312)
Upstream-commit: b87cb76976da57a6765acd9a85494c68a4e6b948
Component: engine
2014-04-21 01:32:00 +08:00
Sven Dowideit
e783599ff4
on a fresh OSX, /usr/local/bin doesn't exist
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: b26821e5c01bc0176357c41cdb7ff9a7cf3fb9df
Component: engine
2014-04-20 22:56:22 +10:00
Tianon Gravi
8d460ab22d
Merge pull request #5213 from tianon/missing-ps-requirement
...
Add missing "ps" requirement to PACKAGERS.md
Upstream-commit: 231f53fd9b52229ba3aa1d27bdebf775ab7397b5
Component: engine
2014-04-19 21:24:30 -06:00
Tianon Gravi
ffd34e18cf
Merge pull request #5313 from Lance0312/arch-fd-link
...
Fix borken /dev/fd in mkimage-arch.sh
Upstream-commit: cb2ce9089c571eb11c5c460e27e82ba32b1be9ef
Component: engine
2014-04-19 21:23:18 -06:00
Sven Dowideit
e5c2e2ce0f
Merge pull request #5312 from ostezer/docs-illusion-confusion
...
Urgent fix for crazy docs error on volumes.
Upstream-commit: f10bb364bedab7060657f313996fd7fecf50c67d
Component: engine
2014-04-20 12:02:47 +10:00
Tianon Gravi
5253167dce
Merge pull request #5249 from tianon/make-validate
...
Add "validate" Makefile target
Upstream-commit: f2f33d709633a66a5487a946d157e82d117d188b
Component: engine
2014-04-19 11:35:14 -06:00
O.S.Tezer
c61da19ea2
Urgent fix for crazy docs error on volumes.
...
Elaborate on the volumes example to prevent confusion.
Update: Amend the example so it is executable by the reader.
This includes fixing the erring "/var/logs" statement with "/var/log".
Update: Fix sentence structuring to better suit the 80chrs. limit.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: 97daf9864d835ae0883b3c03382ac5dca11b4cc9
Component: engine
2014-04-19 19:35:00 +03:00
Sven Dowideit
04eca0093d
Merge pull request #5309 from ostezer/docs-fix-apostrophe
...
Introducing spīritus lēnis to fix code highlighting issues due to apostrophe.
Upstream-commit: 1c7560289047fc3c374793b11a0fba07bf22939b
Component: engine
2014-04-19 20:39:27 +10:00
Sven Dowideit
0f92a67693
Merge pull request #5311 from ostezer/docs-fix-footer-links
...
Fix footer links. They are pointing to the wrong direzione.
Upstream-commit: c7f5799120859c39716267fca322b82d75ea2a03
Component: engine
2014-04-19 20:38:44 +10:00
Lance Chen
4dd6b5c6c0
Fix broken /dev/fd in mkimage-arch.sh
...
Exactly the same problem as dotcloud/docker#2356
Docker-DCO-1.1-Signed-off-by: Lance Chen <cyen0312@gmail.com > (github: Lance0312)
Upstream-commit: e6b794e5424dd108003063f70e2fb2973dba643e
Component: engine
2014-04-19 16:04:35 +08:00
Michael Crosby
112b738831
Add remove method to subsystems
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 7fdeda87173ee6722ef1cbe7b21a13ac8b173365
Component: engine
2014-04-18 22:17:31 -07:00
Michael Crosby
39b03cf53c
Break down groups into subsystems
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: e92f2fd3950644a6e5eb38259cee9036648090cb
Component: engine
2014-04-18 22:10:30 -07:00
Michael Crosby
fec63c3950
Move raw cgroups into fs package (filesystem)
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 06db0604e5e5438dc14e13a069ebddcab7bb4bc6
Component: engine
2014-04-18 21:34:26 -07:00
Michael Crosby
91235494a6
Move systemd code into pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: ec43ec50b44cff3f043c78cad97466c68e2ba8cd
Component: engine
2014-04-18 21:30:08 -07:00
Michael Crosby
0b62a2c5be
Refactor cgroups file locations
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 42fb2973c690fe4e4f65da235ce4dfa4c388e8a3
Component: engine
2014-04-18 21:14:58 -07:00
O.S.Tezer
1e6c7a9fbb
Fix footer links. They are pointing to the wrong direzione.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: a96106b5f159791768174a6d74a1344b203de685
Component: engine
2014-04-19 04:13:52 +03:00
Solomon Hykes
cc849c45fa
Merge pull request #4166 from shykes/engine-logging
...
Engine: optional Logging field to disable custom logging in engine.
Upstream-commit: 4c720d4de73e53fa189083903e7ff825d0889021
Component: engine
2014-04-18 18:05:00 -07:00
O.S.Tezer
e0138ab848
Introducing spīritus lēnis to fix code highlighting issues due to apostrophe.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: 2d6324e06a1e2ea8bb2236472a99c3dc4b5f66d1
Component: engine
2014-04-19 03:35:45 +03:00
Sven Dowideit
6132c88c2f
Merge pull request #5307 from ostezer/docs-amend-notes-warnings
...
Mark notes and warnings, fix broken link renderings within.
Upstream-commit: 87014c0328a95b9eade3a207cef77b71d8700565
Component: engine
2014-04-19 08:48:55 +10:00
O.S.Tezer
c565574306
Mark notes and warnings, fix broken link renderings within.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: 7935850005b775e0cd1a99f9bab1b8cd53784c3a
Component: engine
2014-04-18 23:31:38 +03:00
Victor Vieux
08dcc28715
Merge pull request #5264 from unclejack/change_inode_map
...
change inode map to struct from bool
Upstream-commit: 5b6b91aa2c1354e484a64479418e92031765d41e
Component: engine
2014-04-18 11:48:23 -07:00
unclejack
5ba9282149
Merge pull request #5304 from vieux/convert_rm_tests
...
convert so rm tests to integration-cli
Upstream-commit: 2931979a5d6abb544fbbfdc359c5f6c131a58c41
Component: engine
2014-04-18 21:11:18 +03:00
unclejack
bd8b23c03f
Merge pull request #5296 from crosbymichael/move-integration-tests
...
Move integration tests
Upstream-commit: c25704e31bc68afaa22b886333d20c3bacbac2ec
Component: engine
2014-04-18 21:01:33 +03:00
Victor Vieux
86a52f5d6b
convert so rm tests to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: fcbc717f9aa11dae75d7418482f51cb61c0bf001
Component: engine
2014-04-18 17:40:12 +00:00
unclejack
9cb488d888
Merge pull request #5236 from crosbymichael/remove-ghost-networking
...
Remove ghost networking
Upstream-commit: c2df189ea57d6fc2ad2f769d88b740a56dfd4bd9
Component: engine
2014-04-18 20:38:12 +03:00
shin-
ee1f88fe1b
Added support for multiple endpoints in X-Docker-Endpoints header
...
Docker-DCO-1.1-Signed-off-by: Joffrey F <joffrey@docker.com > (github: shin-)
Upstream-commit: 720f3447046355329b5ba5d850caca84328182d5
Component: engine
2014-04-18 17:42:54 +02:00
O.S. Tezer
2282ad2b57
Merge pull request #5298 from SvenDowideit/remove-auto-markdown-conversion
...
Merged.
Upstream-commit: 3eea3e071478e51c984ca30a8235a331f9f6a91b
Component: engine
2014-04-18 14:13:36 +03:00
Sven Dowideit
2a4849bb16
the markdown docs are now master, but I may do a manual conversion a few more times when older PR's are merged
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: d4a00c749440899c629a9f67b968295a4673c476
Component: engine
2014-04-18 16:34:53 +10:00
Michael Crosby
4078a75e3a
Remove worthless iptables test
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 58e011595e4c518a38ec27716585177faa969f72
Component: engine
2014-04-18 03:22:53 +00:00
Michael Crosby
42d84ccd4c
Port privileged tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 296fcf331f2886d2aba3cfb929887dfbb603643d
Component: engine
2014-04-18 03:20:17 +00:00
William HenryandErik Hollensbe
Tianon GraviandErik Hollensbe
Guillaume J. Charmes
Guillaume J. Charmes
Michael Crosby
O.S. Tezer
Michael Crosby
Evan Hazlett
Lance ChenandLance Chen
Sven Dowideit
O.S.Tezer
Solomon Hykes
Victor Vieux
unclejack
shin-