tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,794 Commits 19 Branches 259 Tags 62 MiB
Commit Graph

345 Commits

Author SHA1 Message Date
Daniel Nephin 4ae2a0e610 Update release scripts for release image. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-06 15:21:34 -04:00
Daniel Nephin 97dc4895ac Remove unnecessary router.php from wordpress example. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-06 11:37:36 -04:00
Daniel Nephin 39cea970b8 alpine docker image for running compose and a script to pull and run it with the 
correct volumes.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-10-02 11:38:35 -04:00
Daniel Nephin bd1373f527 Bump 1.4.2 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-23 14:24:13 -04:00
Mary Anthony 62ca8469b0 Fixing misspelling of WordPress 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-09-21 08:58:05 -07:00
moxiegirl 1deb534fee Merge pull request #2066 from mnowster/reorder-reference-docs 
Reorder reference docs
 2015-09-21 06:12:49 -07:00
mnowster b9252aa48e Merge pull request #2032 from villlem/master 
Flag to skip all pull errors when pulling images
 2015-09-21 13:41:08 +01:00
Aanand Prasad 18dbe1b1c0 Merge pull request #2051 from dnephin/extend_compose_files 
Extend compose files by allowing multiple files
 2015-09-21 12:34:22 +02:00
Vojta Orgon c9083e21c8 Flag to skip all pull errors when pulling images. 
Signed-off-by: Vojta Orgon <villlem@gmail.com>
 2015-09-21 11:59:23 +02:00
Aanand Prasad 3e58003bd3 Merge pull request #2041 from ggtools/master 
Add new --pull option in build.
 2015-09-18 16:49:05 +01:00
Mazz Mosley 0232fb10d7 Alphabetise run options 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-09-18 11:30:24 +01:00
Mike Bailey aac916c73e Alphabetise reference list 
Bring in line with Glossary. https://docs.docker.com/reference/glossary/

Alphabetising list makes makes parsing by humans easier.

Signed-off-by: Mike Bailey <mike.bailey@rea-group.com>

Conflicts:
	docs/yml.md
 2015-09-18 11:25:59 +01:00
Daniel Nephin fd75e4bf63 Update docs about using multiple -f arguments 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 14:20:21 -04:00
mnowster 1c823597bb Merge pull request #1995 from predakanga/master 
Added support for IPC namespaces, fixes GH-1689
 2015-09-17 17:14:44 +01:00
mnowster d577cd6877 Merge pull request #2059 from ZJaffee/master 
Change Wordpress > WordPress in the documentation #2052
 2015-09-17 15:40:22 +01:00
Zachary Jaffee fb83b4c6a4 updated wordpress format syntax 
Signed-off-by: Zachary Jaffee <zjaffee@us.ibm.com>
 2015-09-17 09:56:44 -04:00
Daniel Nephin c2b8d5863a Merge pull request #2053 from dnephin/update_release_notes 
Add 1.4.1 release notes and download instructions
 2015-09-16 14:17:40 -04:00
Aanand Prasad bbc8765343 Fix typo in docs/index.md 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-16 12:38:59 +01:00
Daniel Nephin 7c32fcbcf5 Add 1.4.1 release notes and download instructions. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-15 18:03:17 -04:00
Christophe Labouisse 39786d4da7 Add new --pull option in build. 
Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
 2015-09-15 20:19:17 +02:00
moxiegirl f49fc1867c Merge pull request #1959 from charleswhchan/patch-1 
Touch up documentation for Docker Compose.
 2015-09-15 10:17:49 -07:00
Mazz Mosley a594a2ccc2 Disallow booleans in environment 
When users were putting true/false/yes/no in the environment key,
the YML parser was converting them into True/False, rather than leaving
them as a string.

This change will force people to put them in quotes, thus ensuring
that the value gets passed through as intended.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-09-15 15:33:30 +01:00
Charles Chan a95ac0f0e0 Touch up documentation for Docker Compose. 
index.md:
* clarify Python & Flask
* minor edits & reformatting

install.md:
* merge the elevated installation instructions with `sudo -i` discussed by @asveepay and @aanand in PR #1201; fixes #1081 (not sure what happened to the merge, but it's not showing up on the master branch or website)
* minor edits

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
 2015-09-13 20:00:55 -07:00
Daniel Nephin 4641d40526 Document limitation of other log drivers. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-11 12:54:27 -04:00
Daniel Nephin 1eb925ee31 Link between pages in the CLI reference section 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-10 13:53:26 -04:00
Daniel Nephin 4bdf57ead8 Add a where to go next section to the main index page for compose 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-10 13:53:26 -04:00
Daniel Nephin 860b304f4a Add COMPOSE_API_VERSION to the docs 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-10 13:53:19 -04:00
Lachlan Pease 851129de6c Added documentation for IPC config 
Signed-off-by: Lachlan Pease <predatory.kangaroo@gmail.com>
 2015-09-10 23:34:07 +10:00
Aanand Prasad 10cb0c921a Merge pull request #1963 from shin-/1923-catch-timeout 
Exit gracefully when requests encounter a ReadTimeout exception.
 2015-09-04 16:14:32 -07:00
Mazz Mosley 0f60c783fa Remove trailing white space 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-09-04 17:01:44 +01:00
Charles Chan 000bf1c16a Fix #1958. Remove release notes for old version of Docker Compose. 
Replace by link to the latest CHANGELOG in GitHub.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
 2015-09-03 21:18:26 -07:00
Joffrey F 80c9092999 Document COMPOSE_HTTP_TIMEOUT env config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-02 12:52:48 -07:00
mnowster 17bd11c334 Merge pull request #1940 from hermanjunge/patch-1 
Fix doc install.md
 2015-08-31 10:43:30 +01:00
Herman Junge 9543cb341b Fix doc install.md 
termial -> terminal

Signed-off-by: Herman Junge <hermanalonsojunge@gmail.com>
 2015-08-28 11:51:04 -03:00
mnowster 0074d74d7a Merge pull request #1914 from bbirand/patch-1 
Export COMPOSE_FILE
 2015-08-28 12:13:42 +01:00
Karol Duleba 477d4f491d Do not allow to specify both image and dockerfile in configuration. Closes #1908 
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
 2015-08-27 19:36:39 +01:00
Daniel Nephin 59d4f304ee Run pre-commit on all files 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-24 17:04:50 -04:00
Berk Birand a57ce1b1ba Export COMPOSE_FILE 
The environment variable is not used by `docker-compose` without the `export` line..

Signed-off-by: Berk Birand <berk@berkbirand.com>
 2015-08-24 15:48:14 -04:00
Frank Sachsenheim 227584b864 Adds pause and unpause-commands 
Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
 2015-08-21 12:43:13 +02:00
Joel Hansson 61936f6b88 log_opt: change address to syslog-address 
Signed-off-by: Joel Hansson <joel.hansson@ecraft.com>
 2015-08-20 16:46:06 +02:00
Karol Duleba 56f03bc20a Allow to specify image by digest. Fixes #1670 
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
 2015-08-19 21:13:34 +01:00
Maxime Horcholle 18a474211d remove extra ``` 
Signed-off-by: mhor <maxime.horcholle@gmail.com>
 2015-08-18 09:09:37 +02:00
Daniel Nephin b87c09b9fc Merge pull request #1824 from mrfuxi/run-with-ports 
Allow manual port mapping when using "run" command
 2015-08-13 08:29:25 -07:00
Karol Duleba ff87ceabbd Allow manual port mapping when using "run" command. Fixes #1709 
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
 2015-08-12 18:54:42 +01:00
Aanand Prasad ed31673069 Merge pull request #1827 from mnowster/port-ranges 
Port ranges
 2015-08-12 11:17:22 +01:00
Mary Anthony d454a584da Fixing links after crawl 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-08-11 09:38:49 -07:00
Aanand Prasad 46e8e4322a Show a warning when a relative path is specified without "./" 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-10 19:56:36 +01:00
Mary Anthony 7c128b46a1 - Closes #1811 for Toolbox 
- Updating with comments

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-08-09 10:51:39 -07:00
Mazz Mosley d1455acb64 Update docs inline with feedback 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-08-07 16:30:00 +01:00
Yuval Kohavi 557cbb616c ports documentation 
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
 2015-08-07 16:22:39 +01:00