docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,873 Commits 21 Branches 28 Tags 816 MiB
Commit Graph

300 Commits

Author SHA1 Message Date
Tianon Gravi cb92c47144 Fix several man page spelling errors 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-06-14 01:49:51 -06:00
Asbjørn Enge cb47ddd968 Added highlight for the COPY instruction 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
 2014-06-12 08:25:09 +02:00
Tianon Gravi 5ff3a28cb4 Merge pull request #6252 from tianon/update-check-config 
Update contrib/check-config.sh to check for CGROUP_FREEZER and to use /proc/mounts
 2014-06-10 08:09:34 -06:00
Zac Dover 8f99875d03 BZ#1104401 
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com> (github: zdover23)
 2014-06-08 14:15:37 +10:00
Tianon Gravi a59e1949b5 Update contrib/check-config.sh to check for CGROUP_FREEZER (which is newly required), and to use /proc/mounts for checking if we have a cgroup hierarchy instead of using /proc/$$/mountinfo (which on systemd might not list the cgroup hierarchy) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-06-07 08:43:40 -06:00
James Turnbull 19ef3ff112 Merge pull request #6182 from mheon/fix_manpage_issue 
Clarify manpages on docker start
 2014-06-05 15:15:50 -07:00
Victor Vieux 3704996089 Merge pull request #6082 from FLGMwt/2342-change-wording-uploading-context 
Change 'Uploading context' wording
 2014-06-03 23:58:20 -07:00
unclejack a2ec8fa1db Merge pull request #6181 from SvenDowideit/change-out-port-number 
IANA allocated Docker port: 2375
 2014-06-04 01:07:48 +03:00
Matthew Heon d96eb47dee Added note in manpages to clarify effect of docker start on started container 
When run on a container that is already running, docker always succeeds.
This was an intentional change in v0.10; it previously caused an error.
This commit clarifies the man pages to indicate this is intended behavior.

Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com> (github: mheon)
 2014-06-03 17:10:59 -04:00
SvenDowideit 5febba93ba IANA allocated Docker port: 2375 
2375/2376 are assigned:
http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=docker

For #1440

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-06-04 06:54:19 +10:00
James Turnbull 9fc8028c98 Changed all references from Trusted Builds to Automated Builds 
* Updated docker images output
* Deprecated docker images -t/--trusted option and replace with --automated
* Changed *trusted variables to *automated
* Changed added support for is_automated alongside deprecated is_trusted
* Updated man pages, docs and completion
* Updated API documentation

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
 2014-06-03 12:55:30 -07:00
Sven Dowideit 7f55d92837 Merge pull request #6173 from zdover23/03_Jun_2014 
grammar; nothing big (added a "the")
 2014-06-03 10:48:20 -07:00
Zac Dover 3a77a73a85 grammar; nothing big 
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com> (github: zdover23)

Added another "The"

Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com> (github: zdover23)
 2014-06-03 15:40:22 +10:00
James Turnbull 19e4fddcce Merge pull request #6122 from mheon/fix_manpage_issue 
Added documentation for special case in run command
 2014-06-02 21:19:43 -07:00
Sven Dowideit dd93845ad0 Merge pull request #6056 from ipbabble/master 
Made fixes to man pages to remove some ambiguities and typos
 2014-06-02 18:01:22 -07:00
William Henry 2858180a9a Changed the term rename to alias etc. 
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)

 Changes to be committed:
	modified:   contrib/man/md/docker-tag.1.md
 2014-06-01 17:16:14 -06:00
William Henry e471a87f19 Fixed some typos and other issues from ostezer 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.1.md
	modified:   contrib/man/md/docker-run.1.md
	modified:   contrib/man/md/docker-tag.1.md
 2014-05-31 15:44:17 -06:00
Matt Heon ba1c0f4c81 Documented special case of container memory limits in manpages 
If a container is started with a memory limit of 0, no memory limit is applied.
To prevent this from causing confusion, make interaction explicit in docs.

Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com> (github: mheon)
 2014-05-30 13:55:13 -04:00
Robin Speekenbrink a0505edc9a 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)
 2014-05-29 11:20:41 +10:00
FLGMwt 50417f6abc Change 'Uploading context' wording 
Docker-DCO-1.1-Signed-off-by: Ryan Stelly <ryan.stelly@live.com> (github: FLGMwt)
 2014-05-28 11:59:29 -05:00
Sven Dowideit f00c2e5007 Merge pull request #5957 from cgwalters/manpage-typo 
docker-run.1: Fix typo 'priviledged'
 2014-05-28 22:43:46 +10:00
Sven Dowideit 58a0e8af8a Merge pull request #6044 from zdover23/27May_dockerfile_2 
27 may dockerfile 2
 2014-05-28 07:58:02 +10:00
William Henry a14a88e53d Fixed some typos in docker-build. 
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
 2014-05-27 12:05:48 -06:00
William Henry 2cb184ade5 Some changes to semantics around tagging, detaching. 
Tried to clarify some of the semantics regarding --tag and renaming etc.
Added some text clarifying how to detach from a running containers.
Fixed a bug that reference /varlog instead of /dev/log.

Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)

Changes to be committed:
	modified:   docker-attach.1.md
	modified:   docker-build.1.md
	modified:   docker-run.1.md
	modified:   docker-tag.1.md
 2014-05-27 11:56:11 -06:00
Zac Dover 2bbf87504b fixed spacing, removed extraneous line 
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com> (github: zdover23)
 2014-05-28 03:32:52 +10:00
Tianon Gravi b2cf28306d Merge pull request #6029 from jeffreybolle/master 
Update upstart script to ensure networking is up before starting docker
 2014-05-27 11:23:54 -06:00
Sven Dowideit 4a2ca56ea0 Merge pull request #6039 from zdover23/26May_dockerfile 
Dockerfile.5.md stub
 2014-05-26 16:46:12 +10:00
Zac Dover 41a913b390 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: )
 2014-05-26 15:57:20 +10:00
Tianon Gravi dd3319636d Fix embarrassing debootstrap typo :) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-05-25 21:59:43 -06:00
Jeffrey Bolle c52889db27 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)
 2014-05-24 19:03:11 +01:00
Tianon Gravi 0c0ffb7773 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)
 2014-05-23 10:27:09 -06:00
Tianon Gravi 8006f6583d Merge pull request #5967 from tianon/consolidated-mkimage 
Add new consolidated mkimage scripts
 2014-05-22 11:27:08 -06:00
Tianon Gravi 51f707cf9d 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)
 2014-05-21 09:58:11 -06:00
Tianon Gravi 7e42505083 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)
 2014-05-21 09:47:36 -06:00
Brian Goff 6d9e64b27b 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)
 2014-05-21 09:35:22 -04:00
Colin Walters cfe7211a22 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)
 2014-05-21 07:00:38 -04:00
Tianon Gravi 47aa9f5a0e Merge pull request #5844 from stpierre/init-script-wait-for-pidfile 
Wait for pidfile to exist when starting with RedHat init script
 2014-05-20 10:25:03 -06:00
Dan Walsh 2e0d47e5c4 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)
 2014-05-16 15:06:34 -04:00
unclejack ba0c829291 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)
 2014-05-16 19:12:59 +03:00
Chris St. Pierre 1ee423bd5d 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)
 2014-05-16 09:36:54 -04:00
Chris St. Pierre a598dba134 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)
 2014-05-16 09:08:59 -04:00
Sven Dowideit 8da44c9b2a Merge pull request #5732 from SvenDowideit/pr_out_the_last_remaining_raw_github_com_url_s 
the last remaining raw.github.com URL's
 2014-05-16 10:01:14 +10:00
Tianon Gravi 8904dfe082 Merge pull request #5657 from tianon/sysvinit-should-start 
Add "Should-Start" cgroupfs-mount and cgroup-lite to sysvinit-debian init script
 2014-05-14 16:05:32 -06:00
Dan Keder 653328c6ce Fix a typo in contrib/man/md/docker.1.md 2014-05-13 11:17:42 +02:00
Sven Dowideit c1108f5d60 the last remaining raw.github.com URL's 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-05-12 14:50:41 +10:00
Tianon Gravi 36d913078b 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)
 2014-05-07 09:46:41 -06:00
Jonathan McCrohan 9e64a4d862 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)
 2014-05-07 08:26:24 +01:00
Dan Walsh e625bad3d7 Fix docker man page to reference selinux-enable flag 
Docker-DCO-1.1-Signed-off-by: Daniel Walsh <dwalsh@redhat.com> (github: rhatdan)
 2014-05-05 08:41:21 -04:00
Tianon Gravi 0037dc8d60 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)
 2014-04-30 11:56:14 -06:00
Tianon Gravi defecac279 Fix various MAINTAINERS format inconsistencies 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-04-30 11:22:11 -06:00