Commit Graph

261 Commits

Author SHA1 Message Date
09681d4edc Add description of --volume read-only/read-write to docker-run man page.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 2e0d47e5c4c63323623c38cf0ca8d63efab8b493
Component: engine
2014-05-16 15:06:34 -04:00
cdfe67b94e contrib/init/upstart: start on local-filesystems
This changes the upstart init script to start on `local-filesystems`.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: ba0c8292917560b45f840f187c2a8f452550705d
Component: engine
2014-05-16 19:12:59 +03:00
3f6b5f9920 Merge pull request #5732 from SvenDowideit/pr_out_the_last_remaining_raw_github_com_url_s
the last remaining raw.github.com URL's
Upstream-commit: 8da44c9b2a3f4ad56df28bd47699b552bdc68a5d
Component: engine
2014-05-16 10:01:14 +10:00
c707e115bd Merge pull request #5657 from tianon/sysvinit-should-start
Add "Should-Start" cgroupfs-mount and cgroup-lite to sysvinit-debian init script
Upstream-commit: 8904dfe08217c82a3985d85448dafe8917cb0c41
Component: engine
2014-05-14 16:05:32 -06:00
bd987eeae1 Fix a typo in contrib/man/md/docker.1.md
Upstream-commit: 653328c6cef8bab89343587b134ba7676ee39867
Component: engine
2014-05-13 11:17:42 +02:00
76ae6d2158 the last remaining raw.github.com URL's
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: c1108f5d605c30a42bb494920b50d486c6e404a4
Component: engine
2014-05-12 14:50:41 +10:00
a947a1c096 Add "Should-Start" cgroupfs-mount and cgroup-lite to sysvinit-debian init script
It's fine to list both here because "Should-Start" is a loose binding (ie, if the listed service exists, it'll be started first, but otherwise, this one will start without it).

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 36d913078b7ea0138dbc5d561703d068e7e31934
Component: engine
2014-05-07 09:46:41 -06:00
d7be599a05 mkimage-debootstrap: set ubuntuLatestLTS as Trusty
Ubuntu 14.04 LTS (Trusty Tahr) was released on Thu, 17 Apr 2014; Update
ubuntuLatestLTS accordingly.

Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com> (github: jmccrohan)
Upstream-commit: 9e64a4d862e38ead4c2708ce61663f176844406b
Component: engine
2014-05-07 08:26:24 +01:00
acd8c3ad90 Fix docker man page to reference selinux-enable flag
Docker-DCO-1.1-Signed-off-by: Daniel Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: e625bad3d7e5eb08568cbd09d9d574b8c63fd203
Component: engine
2014-05-05 08:41:21 -04:00
5ce64c0f94 Remove contrib/zfs directory
A WIP pull request or issue for discussion would be a better avenue for collaboration and discussion of a ZFS backend.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 0037dc8d60bc22e34838e15efaa1041ea2826c2c
Component: engine
2014-04-30 11:56:14 -06:00
bde45636d6 Fix various MAINTAINERS format inconsistencies
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: defecac2799ca0c72532b7e6ed6005cc54ee2e25
Component: engine
2014-04-30 11:22:11 -06:00
32bae00bdb Merge pull request #5349 from ipbabble/manpages
Manpages - fixes and merged tianon/docker man1-assumption branch
Upstream-commit: 0ade0af27ee5de5ac7e1e469dcc23ad408dd3b39
Component: engine
2014-04-24 09:43:42 +10:00
7b803efe2e Merge pull request #5336 from tianon/slightly-more-organized-check-config
Move "possible config locations" list to the top of check-config.sh
Upstream-commit: 6b0f0af0e9a755d4d8e503f4e27ad8b0d24208c5
Component: engine
2014-04-23 11:21:08 -06:00
6f36448e8e Fixed some missing ']' and the TAG
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)

 Changes to be committed:
	modified:   contrib/man/md/docker-build.1.md
Upstream-commit: a6fd2c237ecca330554ec8bdaf7b2acfe68de1ce
Component: engine
2014-04-22 22:35:59 -06:00
ef2162c78d Merge branch 'man1-assumption' of https://github.com/tianon/docker into manpages
Upstream-commit: 687653e59980e35e07521aff7a5cd87b4b0d3be6
Component: engine
2014-04-22 22:21:39 -06:00
107ba1c425 Fixed an missing '-' on the "--rm"
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)

 Changes to be committed:
	modified:   contrib/man/md/docker-build.md
Upstream-commit: a5b4a907485c76088d02226df62b0a27bd76117f
Component: engine
2014-04-22 22:17:33 -06:00
20d84aa049 Update contributed man page file names and compilation script for the eventual possibility of non-man1 man pages (hopefully a Dockerfile.5.md, for example)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: f763075c74aeb8a829cb310164f36015fb4bc806
Component: engine
2014-04-22 06:43:08 -06:00
7f0a8b69ee Move "possible config locations" list to the top of check-config.sh
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 2c4cebe916299c7485e929e49ebc6d263e3769cf
Component: engine
2014-04-22 06:26:44 -06:00
c9094c699e Changed Image to image.
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: ac8c705c952b7151cc0bf075742146cac3b93cac
Component: engine
2014-04-21 14:37:08 -06:00
8fc8d36610 Further edtis based on comments.
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)

 Changes to be committed:
	modified:   contrib/man/md/README.md
	modified:   contrib/man/md/docker-build.md
	modified:   contrib/man/md/docker-cp.md
	modified:   contrib/man/md/docker-logs.md
	modified:   contrib/man/md/docker-push.md
Upstream-commit: 73257a72ea15cbe67f40cf516129695fae65be33
Component: engine
2014-04-21 14:28:25 -06:00
486dbb873e Edits based on Sven's comments.
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)

 Changes to be committed:
	modified:   contrib/man/md/docker-build.md
	modified:   contrib/man/md/docker-commit.md
Upstream-commit: bbde4298a5c8e12afb6a7bc81c3634b97c2a3c7d
Component: engine
2014-04-21 11:55:06 -06:00
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
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
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
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
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
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
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
f7be50364d Rename runtime/* to daemon/*
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 359b7df5d2af5733b8a1ea6746d062053053b23e
Component: engine
2014-04-17 14:43:01 -07: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
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
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
cf46b873e9 Update check-config.sh with more kernel configs and more reliable cgroup hierarchy/subsystem check
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 5737c2eb9878e36ee9476e0fd105bcd494252d12
Component: engine
2014-04-07 22:53:42 -06:00
0de230c821 Fix a few minor man formatting consistency issues
Some flags ended with a colon, some didn't.  For man pages, the prevailing normal practice is not to end the flags lines with colons.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 7908725e3f8b3c8a69fc6533f28c6789e4669eb0
Component: engine
2014-04-07 21:38:30 -06:00
ccde663938 Merge pull request #5029 from ipbabble/manpages
Added man pages for several docker commands. 
Upstream-commit: be3a5a2e375a3103883529c7da5563d94df036e3
Component: engine
2014-04-08 05:51:20 +03:00
b44d3f0991 Added man pages for several docker commands.
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)

	new file:   contrib/man/man1/docker-attach.1
	new file:   contrib/man/man1/docker-build.1
	new file:   contrib/man/man1/docker-images.1
	new file:   contrib/man/man1/docker-info.1
	new file:   contrib/man/man1/docker-inspect.1
	new file:   contrib/man/man1/docker-rm.1
	new file:   contrib/man/man1/docker-rmi.1
	new file:   contrib/man/man1/docker-run.1
	new file:   contrib/man/man1/docker-tag.1
	new file:   contrib/man/man1/docker.1
Upstream-commit: da8231a26bc4532ded49f93a82e731694ee6587c
Component: engine
2014-04-07 19:15:28 -06:00
dbddde5f2d intermediate image layers are used for more than the build
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 87ea27e80b131ca11d74c89446d4992af0f6c5b9
Component: engine
2014-04-07 18:37:52 +10:00
c231a5f59a Update contrib/check-config.sh cgroupfs check to allow for something like '... cgroup rw,cpu' (looking at you, boot2docker)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: fee16d42163822bb23a51c5ebcb1115efc761947
Component: engine
2014-04-03 11:52:19 -06:00
78e32310f2 Update contrib/check-config.sh to use zcat and grep if zgrep isn't available
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 9712f8127a9ac47a3679e20faea08fb971ee1ecc
Component: engine
2014-04-03 11:46:24 -06:00
811da2f6bf Add more color and cgroupfs hierarchy verification to check-config.sh
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: aec989bd0801657efeeb81bafb2c6c61f60de6d4
Component: engine
2014-04-02 02:44:12 -06:00
91e0f424cb Add basic initial "check-config" script to contrib
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 9c0c4aeda47fcebc4470f7ba786749af2999ec78
Component: engine
2014-04-01 17:42:54 -06:00
205f6c3574 Update fish completions for docker master.
Docker-DCO-1.1-Signed-off-by: Barnaby Gray <barnaby@pickle.me.uk> (github: barnybug)
Upstream-commit: 9d2a77805139598b272ca6e5f55e3542e1221f26
Component: engine
2014-03-27 19:45:47 +00:00
6c925a0b3c Merge pull request #4865 from creack/fix_fish_completion
Fix fish completion when having alias on awk or grep
Upstream-commit: 94538fe022b8f905e2cc6a132242375f7f120fb5
Component: engine
2014-03-27 13:07:11 -06:00
45a3d3da44 upstart: use exec here so upstart can monitor the process and not just a shell
Docker-DCO-1.1-Signed-off-by: Michael Gorsuch <michael.gorsuch@gmail.com> (github: gorsuch)
Upstream-commit: 73ee4879afd557a3ddd0740b0a281024060f2436
Component: engine
2014-03-27 12:44:33 -05:00
70613c0a32 Fix fish completion when having alias on awk or grep
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: e7f3234c1e4926c966f4c9e4cf08d9aae60d21bb
Component: engine
2014-03-26 09:05:21 -07:00
d6e39e4b66 Merge branch 'https_client' of github.com:discordianfish/docker into discordianfish-https_client
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 12687b7c10b6bb7e2a278ba6d1a323fe5e5f81d7
Component: engine
2014-03-19 22:03:11 +00:00
c9b7a0a568 Merge pull request #4744 from LK4D4/fix_issue_#3565
Using names in docker ps --since-id/--before-id, resolves #3565
Upstream-commit: 22c18de7bed169792213843476d06dedbd1ba387
Component: engine
2014-03-18 15:39:56 -07:00
463aedf3de Add upstart nofile/noproc similar to systemd init
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: e27c635c06dcad61ce7185d95debef9ef7c9f7e0
Component: engine
2014-03-18 16:27:20 -04:00
5ac53676ce Using names in docker ps --since-id/--before-id, resolves #3565
Also renames --since-id/--before-id to --since/--before and add errors
on non-existent containers.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: c1f2abd89958a8731211ceb2885eed238a3bea8d
Component: engine
2014-03-18 23:30:21 +04:00
742b723fc2 Move graphdrivers into runtime top level pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 96c4816cef592a98a235010924bb2417c8451079
Component: engine
2014-03-17 11:40:12 -07:00