1
0
mirror of https://github.com/docker/cli.git synced 2026-01-25 03:42:05 +03:00
Commit Graph

279 Commits

Author SHA1 Message Date
Robin Speekenbrink
62daf025f0 updated documentation for mentioning images vs containers
Docker-DCO-1.1-Signed-off-by: Robin Speekenbrink <robin@kingsquare.nl> (github: fruitl00p)

rebased by

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: a0505edc9a890b3d4cdf5cf1850273c250c3dc41
Component: engine
2014-05-29 11:20:41 +10:00
Sven Dowideit
775ca94cb2 Merge pull request #5957 from cgwalters/manpage-typo
docker-run.1: Fix typo 'priviledged'
Upstream-commit: f00c2e5007cb7843c2bcea53e4a86835d3d5a958
Component: engine
2014-05-28 22:43:46 +10:00
Sven Dowideit
ea93628b07 Merge pull request #6044 from zdover23/27May_dockerfile_2
27 may dockerfile 2
Upstream-commit: 58a0e8af8af0989139a3d3c6c3cae1fc30ae24de
Component: engine
2014-05-28 07:58:02 +10:00
Zac Dover
2d0986f24f fixed spacing, removed extraneous line
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com> (github: zdover23)
Upstream-commit: 2bbf87504bc9eb6ee9a4694ce4d1d98287bccbc9
Component: engine
2014-05-28 03:32:52 +10:00
Tianon Gravi
b0d8dff201 Merge pull request #6029 from jeffreybolle/master
Update upstart script to ensure networking is up before starting docker
Upstream-commit: b2cf28306dce561b5c5d14057c848e445e733fef
Component: engine
2014-05-27 11:23:54 -06:00
Sven Dowideit
cdddc7f9a6 Merge pull request #6039 from zdover23/26May_dockerfile
Dockerfile.5.md stub
Upstream-commit: 4a2ca56ea0b5bff797c3d1150c18f5797e58c839
Component: engine
2014-05-26 16:46:12 +10:00
Zac Dover
4c7d9e6500 Dockerfile.5.md stub
Properly formatted DCO:
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com> (github: zdover23)

Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com> (github: )
Upstream-commit: 41a913b3906348f6ec3f1929e6d33926c84c1bf1
Component: engine
2014-05-26 15:57:20 +10:00
Tianon Gravi
7cbab5a63c Fix embarrassing debootstrap typo :)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: dd3319636d749bac3d57fbcd1c3cf4d31fded8b7
Component: engine
2014-05-25 21:59:43 -06:00
Jeffrey Bolle
335a844d29 Ensure networking is up before starting docker
This resolves a problem that I have been having where docker starts before networking is up. See issue #5944 for more details.

Docker-DCO-1.1-Signed-off-by: Jeffrey Bolle <jeffreybolle@gmail.com> (github: jeffreybolle)
Upstream-commit: c52889db27a2af09ed7f6c92f2d6c6fd9737bf63
Component: engine
2014-05-24 19:03:11 +01:00
Tianon Gravi
cd12b8d562 Add more required cgroup subsystems to check-config.sh (specifically, SCHED for cpu and CPUACCT for cpuacct)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 0c0ffb777354ab0d65fdb92fac47272584b2d217
Component: engine
2014-05-23 10:27:09 -06:00
Tianon Gravi
4f40541082 Merge pull request #5967 from tianon/consolidated-mkimage
Add new consolidated mkimage scripts
Upstream-commit: 8006f6583d38dbb87e9d525089c0e4d2f933f918
Component: engine
2014-05-22 11:27:08 -06:00
Tianon Gravi
bcf6aedaa9 Add deprecation warnings to the mkimage scripts that are have consolidated mkimage implementations
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 51f707cf9dfb2dbe31cfd0cd92b922ca5d98e842
Component: engine
2014-05-21 09:58:11 -06:00
Tianon Gravi
4857deee3f Add new consolidated mkimage scripts
These new scripts are streamlined such that, for example, "contrib/mkimage/debootstrap" is _only_ responsible for filling a directory with the results of running debootstrap, and it can accept any arbitrary arguments.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 7e42505083cca90d445eb8a9d7d4a4bf9ffb35a4
Component: engine
2014-05-21 09:47:36 -06:00
Brian Goff
a2fa77b792 Fixes some docs issues with using single-dash arguments where they should be double
I found a bunch of issues where we have "-<opt>" instead of "--<opt>".
Also a couple of other issues, like "-notrunc", which is now "--no-trunc"
Fixes #5963

Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 6d9e64b27bbee9bb699ebc0f0ff98bb7f56961b3
Component: engine
2014-05-21 09:35:22 -04:00
Colin Walters
5793c36d34 man/docker-run.1: Fix typo 'priviledged', add missing closing brackets
Docker-DCO-1.1-Signed-off-by: Colin Walters <walters@verbum.org> (github: cgwalters)
Upstream-commit: cfe7211a2241b5e898af11445a2470032b0ab242
Component: engine
2014-05-21 07:00:38 -04:00
Tianon Gravi
91009e208d Merge pull request #5844 from stpierre/init-script-wait-for-pidfile
Wait for pidfile to exist when starting with RedHat init script
Upstream-commit: 47aa9f5a0e38f395cee7517720f8a80587bb911b
Component: engine
2014-05-20 10:25:03 -06:00
Dan Walsh
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
unclejack
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
Chris St. Pierre
d8d2d008c4 added timeout when waiting for docker pidfile
Docker-DCO-1.1-Signed-off-by: Chris St. Pierre <chris.a.st.pierre@gmail.com> (github: stpierre)
Upstream-commit: 1ee423bd5dd7abf6f5f4662132b77fdebf14529a
Component: engine
2014-05-16 09:36:54 -04:00
Chris St. Pierre
cdfc80841a Wait for pidfile to exist when starting with Redhat init script
Fixes #5359

Docker-DCO-1.1-Signed-off-by: Chris St. Pierre <chris.a.st.pierre@gmail.com> (github: stpierre)
Upstream-commit: a598dba1346c9f2e878e8250a9d641a2206cb4e5
Component: engine
2014-05-16 09:08:59 -04:00
Sven Dowideit
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
Tianon Gravi
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
Dan Keder
bd987eeae1 Fix a typo in contrib/man/md/docker.1.md
Upstream-commit: 653328c6cef8bab89343587b134ba7676ee39867
Component: engine
2014-05-13 11:17:42 +02:00
Sven Dowideit
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
Tianon Gravi
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
Jonathan McCrohan
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
Dan Walsh
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
Tianon Gravi
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
Tianon Gravi
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
Sven Dowideit
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
Tianon Gravi
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
William Henry
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
William Henry
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
William Henry
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
Tianon Gravi
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
Tianon Gravi
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
William Henry
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
William Henry
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
William Henry
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
William Henry
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
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
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
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
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
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
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
Alexander Larsson
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
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
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
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