94e6727831
Re-order docs Makefile for better caching.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-08 19:12:02 -04:00
5fbde6106e
Merge pull request #2157 from mnowster/2151-missing-port-range
...
Put port ranges back in
2015-10-08 10:22:33 -04:00
a3eb563f94
Put port ranges back in
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-08 11:50:27 +01:00
23fcace36c
Bug fix: Use app's Gemfile.lock in Dockerfile
...
The Dockerfile should use the same Gemfile.lock as the app, to make sure the container gets the expected versions of gems installed. Aside from wanting that in principle, without it you can get mysterious gem dependency errors. Here's the scenario:
1. Suppose `Gemfile` includes `gem "some-active-gem", "~> 1.0"
2. When developing the app, you run `bundle install`, which installs the latest version--let's say, 1.0.1-and records it in `Gemfile.lock`
3. Suppose the developers of `some-active-gem` then release v1.0.2
4. Now build the container: docker runs `bundle install`, which installs v1.0.2 and records it in `Gemfile.lock` and then "ADD"s the app worktree, which replaces the `Gemfile.lock` with the one from the worktree that lists v1.0.1.
5. Immediately run your app and it fails with the error `Could not find some-active-gem-1.0.1 in any of the sources` which is a bit befuddling since you just saw it run bundle install so you expect all gem dependencies to be resolved properly.
Signed-off-by: ronen barzel <ronen@barzel.org>
2015-10-08 03:08:50 +01:00
c8cd618df9
Merge pull request #2145 from dnephin/update_release_scripts
...
Update release scripts for release image
2015-10-07 15:51:04 +01:00
627f1acdc4
Merge pull request #2126 from mnowster/1188-support-ro-options-in-volumes-from
...
1188 support ro options in volumes from
2015-10-07 11:57:14 +01:00
21a1affc63
Re-word docs.
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-07 11:27:13 +01:00
4ae2a0e610
Update release scripts for release image.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-06 15:21:34 -04:00
97dc4895ac
Remove unnecessary router.php from wordpress example.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-06 11:37:36 -04:00
5b55a08846
Add support for ro option in volumes_from
...
Fixes #1188
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-06 13:12:55 +01:00
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
bd1373f527
Bump 1.4.2
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-23 14:24:13 -04:00
62ca8469b0
Fixing misspelling of WordPress
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-09-21 08:58:05 -07:00
1deb534fee
Merge pull request #2066 from mnowster/reorder-reference-docs
...
Reorder reference docs
2015-09-21 06:12:49 -07:00
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
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
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
3e58003bd3
Merge pull request #2041 from ggtools/master
...
Add new --pull option in build.
2015-09-18 16:49:05 +01:00
0232fb10d7
Alphabetise run options
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-18 11:30:24 +01:00
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
fd75e4bf63
Update docs about using multiple -f arguments
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-17 14:20:21 -04:00
1c823597bb
Merge pull request #1995 from predakanga/master
...
Added support for IPC namespaces, fixes GH-1689
2015-09-17 17:14:44 +01:00
d577cd6877
Merge pull request #2059 from ZJaffee/master
...
Change Wordpress > WordPress in the documentation #2052
2015-09-17 15:40:22 +01:00
fb83b4c6a4
updated wordpress format syntax
...
Signed-off-by: Zachary Jaffee <zjaffee@us.ibm.com>
2015-09-17 09:56:44 -04:00
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
bbc8765343
Fix typo in docs/index.md
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-16 12:38:59 +01:00
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
39786d4da7
Add new --pull option in build.
...
Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
2015-09-15 20:19:17 +02:00
f49fc1867c
Merge pull request #1959 from charleswhchan/patch-1
...
Touch up documentation for Docker Compose.
2015-09-15 10:17:49 -07:00
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
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
4641d40526
Document limitation of other log drivers.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-11 12:54:27 -04:00
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
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
860b304f4a
Add COMPOSE_API_VERSION to the docs
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-10 13:53:19 -04:00
851129de6c
Added documentation for IPC config
...
Signed-off-by: Lachlan Pease <predatory.kangaroo@gmail.com>
2015-09-10 23:34:07 +10:00
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
0f60c783fa
Remove trailing white space
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-04 17:01:44 +01:00
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
80c9092999
Document COMPOSE_HTTP_TIMEOUT env config
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-02 12:52:48 -07:00
17bd11c334
Merge pull request #1940 from hermanjunge/patch-1
...
Fix doc install.md
2015-08-31 10:43:30 +01:00
9543cb341b
Fix doc install.md
...
termial -> terminal
Signed-off-by: Herman Junge <hermanalonsojunge@gmail.com>
2015-08-28 11:51:04 -03:00
0074d74d7a
Merge pull request #1914 from bbirand/patch-1
...
Export COMPOSE_FILE
2015-08-28 12:13:42 +01:00
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
59d4f304ee
Run pre-commit on all files
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-24 17:04:50 -04:00
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
227584b864
Adds pause and unpause-commands
...
Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
2015-08-21 12:43:13 +02:00
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
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
18a474211d
remove extra ```
...
Signed-off-by: mhor <maxime.horcholle@gmail.com>
2015-08-18 09:09:37 +02:00
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
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
ed31673069
Merge pull request #1827 from mnowster/port-ranges
...
Port ranges
2015-08-12 11:17:22 +01:00
d454a584da
Fixing links after crawl
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-08-11 09:38:49 -07:00
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
7c128b46a1
- Closes #1811 for Toolbox
...
- Updating with comments
Signed-off-by: Mary Anthony <mary@docker.com>
2015-08-09 10:51:39 -07:00
d1455acb64
Update docs inline with feedback
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-08-07 16:30:00 +01:00
557cbb616c
ports documentation
...
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
2015-08-07 16:22:39 +01:00
8b5bd945d0
Interpolate environment variables
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-06 11:18:57 +01:00
41b9df7639
Merge pull request #1800 from aanand/volume-driver-support
...
Support volume_driver
2015-07-31 16:28:46 +01:00
a68ee0d9c2
Support volume_driver in compose
...
* Add support for volume_driver parameter in compose yml
* Don't expand volume host paths if a volume_driver is specified
(i.e., disable compose feature "relative to absolute path
transformation" when volume drivers are in use, since volume drivers
can use name where host path is normally specified; this is a
heuristic)
Signed-off-by: Luke Marsden <luke@clusterhq.com>
2015-07-31 15:23:15 +01:00
1a9ddf645d
Remove useless postgres 'port' configuration
...
Signed-off-by: David BF <burretfresket@gmail.com>
2015-07-31 14:40:29 +02:00
118a389646
Update API version to 1.19
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-29 15:44:21 +01:00
b08e23d351
Add hint about OS X binary compatibility
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-29 10:44:38 +01:00
7eabc06df5
Updating build so that contributors can build public docs
...
Changed base image
Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-27 09:43:16 -07:00
e832e86f09
Merge pull request #1762 from aanand/update-changelog-and-install
...
Update CHANGES.md and install.md for latest stable version
2015-07-23 16:37:02 +01:00
227435f613
Update CHANGES.md and install.md for latest stable version
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-23 11:09:27 +01:00
04a773f1c8
Deprecate --allow-insecure-ssl
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-23 10:56:21 +01:00
cc0bfea8a1
Merge pull request #1711 from aanand/custom-names
...
Add container_name option for specifying a custom container name
2015-07-21 14:28:16 +01:00
4ba9d9dac2
Make parallel tasks interruptible with Ctrl-C
...
The concurrent.futures backport doesn't play well with
KeyboardInterrupt, so I'm using Thread and Queue instead.
Since thread pooling would likely be a pain to implement, I've just
removed `COMPOSE_MAX_WORKERS` for now. We'll implement it later if we
decide we need it.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-20 14:13:25 +01:00
4ffae4a1ac
Merge pull request #1725 from moxiegirl/update-docs-dockerfile
...
Updating with the latest image
2015-07-20 12:00:18 +01:00
5f6d0d0824
Merge pull request #1721 from moxiegirl/remove-boot2docker-1720
...
Removing references to boot2docker
2015-07-20 11:52:15 +01:00
9df2be80a8
Merge pull request #1717 from aanand/fix-up-docs
...
Fix regression in docs for 'up'
2015-07-20 11:45:50 +01:00
949dd5b2c7
Updating with the latest image
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-19 16:08:01 -07:00
4ca210edd7
Removing references to boot2docker
...
- Replace with machine references
- 1.8 boot2docker is deprecated
Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-17 16:17:46 -07:00
2407193594
remove cli
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-17 09:15:29 -07:00
98eab03c61
Merge pull request #1068 from likeon/master
...
Docs: yml link in getting started with django
2015-07-17 17:11:38 +01:00
a3191ab90f
Add container_name option
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-17 15:50:09 +01:00
35092f1d5e
Fix regression in docs for 'up'
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-17 15:29:02 +01:00
36f4d413fd
Updating Compose documentation
...
- Split out commands into individual pages for maintainability
- Add full usage in commands pages for usability
- Updated description of the run command
- adding in Aanand's comment
Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-17 07:05:45 -07:00
ced94a3504
Make smart recreate the default
...
Add --force-recreate flag to enable the old default behaviour of
recreating everything.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-17 11:28:02 +01:00
f03dec766d
Rename max workers env var and fix docs
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-15 16:43:43 +01:00
03d34336a8
Document DEFAULT_MAX_WORKERS
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-15 11:56:06 +01:00
a8ad13734e
Merge pull request #1666 from mnowster/docs-for-extends-file-default-behaviour
...
Docs for `file` default behaviour
2015-07-07 17:12:29 +01:00
ef8ae07145
Docs for `file` default behaviour
...
Change in behaviour, `file` key is optional and if not set the
default is to look within the same file as `extends` is defined.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-07 17:01:09 +01:00
6f31e8ebe9
Add support for log_opt
...
When specifying a log_driver you want to specify some options for
the logger as per the docker run --log-opt option. The logger
options are key value pairs.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-07 16:26:43 +01:00
fc26982132
Add in memswap_limit run option
...
By allowing the memswap_limit option to be defined we also need to
check that mem_limit is set, you can't have swap without a limit.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-06 17:08:57 +01:00
20218394b9
Merge pull request #1649 from albers/doc-completion-zsh
...
Mention zsh command completion in general install section
2015-07-06 06:41:09 -07:00
0fa5808389
Merge pull request #1623 from mnowster/documentation-fixes
...
Documentation fixes
2015-07-06 13:25:56 +01:00
2fc7cd6e03
Mention zsh command completion in general install section
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-07-05 19:18:24 +02:00
ae96fc0071
Support reading config from stdin.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-07-02 22:16:22 -04:00
8a47791161
Re-arrange for the more common case
...
boot2docker is the more common case so let's have that one first.
Also be more explicit and clear that the localhost:5000 is applicable
for people running on linux.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 16:20:29 +01:00
ab03f2310b
Include zsh shell
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 16:20:29 +01:00
c45c16cead
Improve localhost & boot2docker info
...
Added a link to boot2docker for those unfamiliar with it.
http://0.0.0.0:5000 didn't resolve for me, however localhost:5000
did, so included reference to that.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 15:58:11 +01:00
d0c499329e
Add a note not to worry
...
When reading through the code for the first time and seeing redis,
those unfamiliar with docker first thought might be that they need
to install redis. Adding this sentence helps make it clearer that
this is not needed. Docker will take care of this in services.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 15:58:10 +01:00
4c31741ac9
Include command completion link
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 15:58:10 +01:00
a7a0888446
Re-phrasing for clarity
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 15:58:10 +01:00
4d69a57edd
Include flask output
...
When running `docker-compose up`, an extra line of output, from flask,
is outputted. I've included it so anyone new to docker-compose who
sees this output will know that it's expected and not worry that
something might have gone wrong.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 15:58:10 +01:00
3906bd067e
Remove redundant import
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 15:58:10 +01:00
8197d0e261
Added uninstall documentation for pip and curl
...
Signed-off-by: Andy Wendt <andy@awendt.com>
2015-06-30 10:27:44 -06:00
52c19bf96c
Fix -d description
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-21 13:06:25 -07:00
511fc4a05c
Replace backtick code blocks with indentation
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-21 12:37:20 -07:00
37ee6b0c19
Merge pull request #1575 from moxiegirl/fix-yaml-code
...
Updating from three ticks to code block
2015-06-19 11:55:57 -07:00
d0102f0761
Fix completion docs URLs
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-06-19 17:57:18 +02:00
c3df62472b
Updating from three ticks to code block
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-19 02:28:09 -07:00
c26b1c8ee9
Entering fixes from Hugo
...
renaming compose-overview back to index
Updating with fixes per Aanand. And others found through test
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-17 21:50:43 -07:00
77c939b256
Merge pull request #1142 from calou/master
...
Added support of option mac-address
2015-06-17 14:39:00 -07:00
b76ac6e633
Added support to option mac-address
...
Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>
Updated doc
Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>
Fixed LINT errors
Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>
Changed mac-address entry order in config keys
Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>
Changed attributes order in docs/yml.md
Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>
2015-06-17 21:28:17 +02:00
acd8dce595
Add upgrading instructions to install docs
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-15 10:46:48 -07:00
e40fc02561
Testing with documentation tooling
...
Updating with changes
Updating for Hugo
Adding a README'
moving index.md compose-overview.md in links
changing overview
Updating image to pull
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-14 16:00:08 -07:00
e3ba302627
Docs: Update boot2docker shellinit example to use 'eval'
...
The boot2docker documentation has since changed the recommended way to
use shellinit - see boot2docker/boot2docker#786 .
Signed-off-by: Ed Morley <emorley@mozilla.com>
2015-06-10 14:38:35 +01:00
d64bf88e26
Merge pull request #1475 from fordhurley/patch-1
...
Fix markdown formatting for `--service-ports` example
2015-05-30 08:43:48 -05:00
bc8d5923e7
Zsh completion for docker-compose
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-05-29 14:24:55 +02:00
5945db0fa8
Fix markdown formatting for `--service-ports` example
...
Signed-off-by: Ford Hurley <ford.hurley@gmail.com>
2015-05-28 15:45:21 -04:00
91ceb33d5a
Update description of Compose
...
"Define and run multi-container applications with Docker"
Not just development environments, and "complex" is not clear and
not really true.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-05-26 15:42:55 +01:00
ea7ee301c0
Add security_opt as a docker-compose.yml option
...
Signed-off-by: Logan Owen <lsowen@s1network.com>
2015-05-19 13:47:41 -04:00
ad9c5ad938
Fix typo in extends.md
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-14 10:48:35 +01:00
4d745ab87a
Link to getting started guides from each page
...
These are really hard to find.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-05-12 12:44:43 +01:00
df87bd91c8
Added devices configuration option
...
Signed-off-by: Dan Elbert <dan.elbert@gmail.com>
2015-05-11 10:50:58 -05:00
99f2a3a583
Merge pull request #1396 from albers/completion-doc
...
Fix markdown formatting issue
2015-05-07 14:04:16 -04:00
0f2f9db6d8
Merge pull request #1388 from vdemeester/1303-log-driver-support
...
Add support for log-driver as a docker-compose.yml option
2015-05-07 12:00:42 -04:00
d6223371d6
Fix markdown formatting issue
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-05-07 04:41:12 -07:00
f626fc5ce8
Add support for log-driver in docker-compose.yml
...
Closes #1303
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-05-06 13:18:58 +02:00
b06294399a
See #1335 : Added --read-only
...
Signed-off-by: CJ <lim@chernjie.com>
2015-05-02 23:39:39 +08:00
6c95eed781
Merge pull request #1269 from aanand/labels
...
Implement 'labels' option
2015-04-30 20:49:11 -04:00
2e6bc078fb
Implement 'labels' option
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-29 16:45:18 +01:00
fed4377ef6
Merge pull request #1351 from mchasal/1301-alphabetize_usage
...
Fix for #1301 , Alphabetize Commands
2015-04-29 14:21:46 +01:00
a89bc304f6
Merge pull request #1075 from KyleJamesWalker/master
...
Support alternate Dockerfile name.
2015-04-27 10:06:43 -04:00
a982e516fc
Merge pull request #1354 from xwisen/master
...
modified the release notes section the first[PR #972 ]to[PR #1088 ]
2015-04-27 09:56:46 -04:00
3af56e1602
Merge pull request #1200 from chanezon/1148-pat-paul
...
paulczar fixes plus example file
2015-04-27 14:54:14 +01:00
16f8106149
Merge pull request #1158 from chernjie/addhosts
...
Add extra_hosts to yml configuration --add-hosts
2015-04-27 12:26:29 +01:00
0ca9fa8b2b
modified the release notes section the first[PR #972 ]to[PR #1088 ]
...
Signed-off-by: xwisen <xwisen@gmail.com>
2015-04-26 13:16:23 +08:00
688f82c1cf
Add cpuset config.
...
Signed-off-by: xuxinkun <xuxinkun@gmail.com>
2015-04-26 00:14:52 +08:00
9a44708081
Fix for #1301 , Alphabetize Commands
...
Signed-off-by: Michael Chase-Salerno <bratac@linux.vnet.ibm.com>
2015-04-24 20:45:18 +00:00
89789c54ad
Merge pull request #1232 from aleksandr-vin/add-parent-directories-search-for-default-compose-files
...
Add parent directories search for default compose-files
2015-04-24 13:12:24 -04:00
d17c4d27fa
Support alternate Dockerfile name.
...
Signed-off-by: Kyle James Walker <KyleJamesWalker@gmail.com>
2015-04-24 08:30:36 -07:00
25ee3f0033
Remove extra s from --add-host
...
linting...
six.string_types
list-of-strings in examples
disallow extra_hosts support for list-of-dicts
A more thorough sets of tests for extra_hosts
Provide better examples
As per @aanand's [comment](https://github.com/docker/compose/pull/1158/files#r28326312 )
I think it'd be better to check `if not isinstance(extra_hosts_line,
six.string_types)` and raise an error saying `extra_hosts_config must be
either a list of strings or a string->string mapping`. We shouldn't need
to do anything special with the list-of-dicts case.
order result to work with assert
use set() instead of sort()
Signed-off-by: CJ <lim@chernjie.com>
2015-04-24 09:21:29 +08:00
fb81c37ca6
added the extra_hosts option to the yml configuration which exposes the --add-host flag from the docker client
...
Signed-off-by: Sam Wing <sampwing@gmail.com>
2015-04-23 21:54:59 +08:00
8b5015c10f
Bump 1.2.0
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-16 17:48:28 +01:00
2a442ec6d9
Adds Where to Get Help section
...
Signed-off-by: Fred Lifton <fred.lifton@docker.com>
2015-04-09 16:23:25 -07:00
ceff5cb9ca
Add parent directories search for default compose-files
...
Does not change directory to the parent with the compose-file found.
Works like passing '--file' or setting 'COMPOSE_FILE' with absolute path.
Resolves issue #946 .
Signed-off-by: Aleksandr Vinokurov <aleksandr.vin@gmail.com>
2015-04-09 22:36:47 +00:00
a1cd00e3f0
Merge pull request #1251 from aanand/extends-guide
...
Add tutorial and reference for `extends`
2015-04-08 15:47:39 +01:00
4f95e81c6d
Merge pull request #1166 from spk/fix_example_env_file
...
Docs: fix env_file example
2015-04-07 15:52:10 +01:00
619e783a05
Merge pull request #1011 from sdake/master
...
Add a --pid=host feature to expose the host PID space to the container
2015-04-07 13:49:53 +01:00
f3f7f000fe
Add tutorial and reference for `extends`
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-07 13:46:14 +01:00
947742852e
Prepping for 1.6 release.
...
Adds release notes and edits/revises new Compose in production doc.
2015-04-06 16:47:07 -07:00
11a2100d53
Add a --pid=host feature to expose the host PID space to the container
...
Docker 1.5.0+ introduces a --pid=host feature which allows sharing of PID
namespaces between baremetal and containers. This is useful for atomic
upgrades, atomic rollbacks, and monitoring.
For more details of a real-life use case, check out:
http://sdake.io/2015/01/28/an-atomic-upgrade-process-for-openstack-compute-nodes/
Signed-off-by: Steven Dake <stdake@cisco.com>
2015-04-06 11:45:37 -07:00
530d7af5cf
Merge pull request #1253 from aanand/production-guide
...
Add guide to using Compose in production
2015-04-06 10:49:49 -07:00
502d58abe6
Add guide to using Compose in production
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-03 18:56:29 -04:00
eb073c53f4
Merge pull request #1249 from asveepay/update_doc
...
Update install docs for permission denied error
2015-04-03 12:31:38 -07:00
Daniel Nephin
Daniel Nephin
Mazz Mosley
ronen barzel
mnowster
Aanand Prasad
Vincent Demeester
Mary Anthony
Vojta Orgon
Mike Bailey
Zachary Jaffee
Christophe Labouisse
Charles Chan
Lachlan Pease
Joffrey F
Herman Junge
Karol Duleba
Berk Birand
Frank Sachsenheim
Joel Hansson
Maxime Horcholle
Yuval Kohavi
Luke Marsden
David BF
Harald Albers
Andy Wendt
Steve Durrheimer
Sébastien Gruchet
Ed Morley
Ford Hurley
Ben Firshman
lsowen
delbert@umn.edu
CJ
xwisen
xuxinkun
Michael Chase-Salerno
Kyle Walker
Sam Wing
Fred Lifton
Aleksandr Vinokurov
Steven Dake