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
d866415b9a
Update install docs for permission denied error
...
Signed-off-by: Roland Cooper <rcooper@enova.com>
2015-04-03 12:21:15 -05:00
e3cff5d17d
Docs: fix env_file example
...
Thanks-to: @aanand
Signed-off-by: Laurent Arnoud <laurent@spkdev.net>
2015-04-01 11:15:09 +02:00
8584525e8d
Interpret 'build:' as relative to the yml file
...
* This fix introduces one side-effect: the build parameter is now
validated early, when the service dicionary is first constructed.
That leads to less scary stack traces when the path is not valid.
* The tests for the changes introduced here alter the fixtures
of those (otherwise unrelated) tests that make use of the 'build:'
parameter)
Signed-off-by: Moysés Borges Furtado <moyses.furtado@wplex.com.br>
2015-03-31 18:47:26 -03:00
cec6dc28bb
implemented @fredl suggestions
...
Signed-off-by: Patrick Chanezon <patlist@chanezon.com>
2015-03-27 17:12:29 -07:00
98dd0cd1f8
implemented @aanand comments
...
Signed-off-by: Patrick Chanezon <patlist@chanezon.com>
2015-03-27 13:26:51 -07:00
c441ac90d6
paulczar fixes plus example file
...
Signed-off-by: Patrick Chanezon <patlist@chanezon.com>
2015-03-26 16:35:53 -07:00
59f04c6e29
Fixed typo
...
Signed-off-by: Pascal Borreli <pascal@borreli.com>
2015-03-26 19:03:06 +00:00
965426e39b
Revert "Add 'labels:' config option"
...
This reverts commit 721327110d
2015-03-23 15:04:04 -07:00
721327110d
Add 'labels:' config option
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-20 18:12:04 -07:00
4c582e4352
Implement `extends`
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-20 15:45:16 -07:00
528bed9ef6
Fix environment resolution
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-13 14:22:28 +00:00
f393447ac9
Docs: yml link in getting started with django
...
Signed-off-by: Alexander Sterchov i@likeon.name
2015-03-13 13:50:20 +03:00
08f936b2e7
Fix missing space in rails docs
...
From #1031
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-03-04 10:27:25 +00:00
882dc673ce
Edits and revisions to Compose Quickstart guides
2015-02-26 18:58:06 -08:00
ac4e800763
Merge pull request #1009 from aanand/update-docker-install-instructions
...
Point at official Docker install instructions rather than repeating them
2015-02-25 19:11:08 +00:00
2e57575a61
Merge pull request #1018 from aanand/link-to-getting-started-guides
...
Build and link to getting started guides
2015-02-25 19:07:57 +00:00
4ac02bfca6
Ship 1.1.0
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-02-25 18:16:44 +00:00
35d5d1a5b1
Build and link to getting started guides
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-02-25 17:54:02 +00:00
72003de737
Merge pull request #1020 from bfirsh/move-docs-index-higher-up-on-compose-docs
...
Move docs index higher up on index page
2015-02-25 17:52:56 +00:00
bb943d5cb5
Update URLs in documentation
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-02-25 14:58:03 +00:00
178c50d46f
Move docs index higher up on index page
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-02-25 14:09:30 +00:00
5b07c581e0
Add an index to the bottom of the Compose docs as they're scattered around docs.docker.com
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-25 23:38:25 +10:00
34c6920b37
Point at official Docker install instructions rather than repeating them
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-02-24 11:43:14 +00:00
b1739e703b
Merge pull request #1002 from SvenDowideit/add-links-to-references
...
Add links to the main Compose references
2015-02-24 10:43:34 +00:00
c3215a1764
Add links to the main Compose references
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-23 16:13:58 +10:00
bd320b19fe
add ./script/doc to build fig documentation using the docs.docker.com tooling
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-23 13:56:13 +10:00
d95de03de9
Merge pull request #990 from bfirsh/add-title-to-docs-index
...
Add title to docs index
2015-02-19 16:02:22 +00:00
e3eccd1047
Merge pull request #979 from aanand/fix-env-docs
...
Update environment variable names in docs
2015-02-19 14:34:48 +00:00
d32994c250
Add title to docs index
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-02-19 14:34:08 +00:00
a516d61b49
Update environment variable names in docs
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-02-18 11:39:57 +00:00
6eb1c8896f
Merge pull request #952 from fredlf/cli-doc-revision
...
Revises Compose cli reference
2015-02-18 11:38:50 +00:00
5e8bcd2d29
Rejig introduction
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-02-17 10:58:51 +00:00
2eb20d89af
Merge pull request #904 from fredlf/install-doc-revision
...
Revision and edit of Compose install doc
2015-02-13 12:25:32 +00:00
4a33686787
Revises Compose cli reference
2015-02-11 18:22:36 -08:00
9f4775c554
Revision and edit of Compose install doc
...
Fix rc version to latest.
Signed-off-by: Fred Lifton <fred.lifton@docker.com>
2015-02-05 17:48:06 -08:00
b25ed59b1c
Tweak intro
...
We shouldn't yet be recommending production use - for now, let's continue to emphasise the development use case and mention staging/CI.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-02-05 16:17:38 -05:00
75247e5a54
Fix a small typo.
2015-01-31 20:00:04 -05:00
3b7ea5c055
resolve most of my comments
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-01-30 21:27:57 +10:00
461f1ad5d5
Edit and revision of overview & quick start doc
...
Signed-off-by: Fred Lifton <fred.lifton@docker.com>
2015-01-29 19:55:11 -08:00
d8d0fd6dc9
Add Docker docs.docker.com meta-data, and reflow to 80-chars to simplify github diffs
...
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
2015-01-30 13:11:48 +10:00
deb2de3c07
Ship 1.1.0-rc2
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-01-29 18:00:10 -05:00
28fa49e569
Merge pull request #810 from madwire/patch-1
...
Tweaks to the rails tutorial to bring it inline with rails 4.2 release
2015-01-27 14:45:31 -05:00
43fdae8bc6
Ship 1.1.0-rc1
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-01-20 22:42:59 +00:00
8297f55f2c
Remove all website-related stuff from docs
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-01-20 21:00:23 +00:00
724be54f09
Manual fixes to docs
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-01-20 21:00:23 +00:00
e3c4a662d9
Find-and-replace on docs
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-01-20 21:00:23 +00:00
72095f54b2
Merge pull request #639 from albers/bash-completion
...
Bash completion for fig command
2015-01-13 17:46:42 +00:00
aa0c43df96
Add cpu_shares option in fig.yml
...
This options maps exactly the docker run option with the same name.
Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
2015-01-11 20:10:48 +01:00
b903217a4a
Merge pull request #544 from LuminosoInsight/external-links
...
Allow links to containers outside of the project
2015-01-08 10:39:00 -05:00
2406a3936a
Documentation for bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-01-08 15:18:39 +01:00
9a90a27376
be explicit with a ruby version number in the Dockerfile
...
Signed-off-by: Richard Adams <richard@madwire.co.uk>
2015-01-07 19:45:00 +00:00
3b638f0c43
tweaks to the rails tutorial to bring it inline with rail 4.2 release
...
Due to a change in Rack, rails server now listens on localhost instead of 0.0.0.0 by default.
Signed-off-by: Richard Adams <richard@madwire.co.uk>
2015-01-07 17:06:47 +00:00
91c90a722a
Added missing options
...
The stdin_open and tty options are supported by fig but were missing from the documentation.
Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
2015-01-03 23:20:10 +01:00
4257707244
Accept an external_links list in the service configuration dictionary to create links to containers outside of the project
...
Signed-off-by: Jason Bernardino Alonso <jalonso@luminoso.com>
Signed-off-by: Mauricio de Abreu Antunes <mauricio.abreua@gmail.com>
2014-12-30 15:31:33 -05:00
0e172228d1
Merge pull request #485 from squebe/run-service-ports
...
Added map service ports option for run command.
2014-12-19 14:17:57 -08:00
3c105c6db2
Fix typo in dns_search documentation
...
Signed-off-by: Mohammad Salehe <salehe+dev@gmail.com>
2014-12-15 16:37:32 +03:30
5182bd0968
Add dns_search support in yml config
...
Signed-off-by: Mohammad Salehe <salehe@gmail.com>
2014-12-15 16:37:31 +03:30
cc834aa564
Added map service ports option for run command.
...
When using the fig run command, ports defined in fig.yml can be mapped
to the host computer using the -service-ports option.
Signed-off-by: Stephen Quebe <squebe@gmail.com>
2014-12-11 20:30:38 -05:00
481a8cb7ab
Merge pull request #713 from leishman/add-favicon-headers
...
Add favicon.ico and links in header
2014-12-09 14:29:33 -05:00
98b6d7be78
Add support for 'env_file' key
...
Signed-off-by: Ben Langfeld <ben@langfeld.me>
2014-12-08 23:42:09 +00:00
ab77cef7ab
Add favicon.ico and links in header
...
Signed-off-by: Alexander Leishman <leishman3@gmail.com>
2014-12-08 13:04:02 -08:00
5c58180538
Add capability add/drop introduced in Docker 1.2
...
Signed-off-by: Tyler Fenby <tylerfenby@gmail.com>
2014-12-08 12:32:52 -05:00
e9d946b038
Merge pull request #594 from popox/restart-option
...
Add restart option to Fig.
2014-12-08 08:43:27 -08:00
65ae22e79a
Merge pull request #611 from raulcd/604_support_reloading_containers
...
Add signal in the kill CLI commando to send a specific signal to the service
2014-11-13 10:28:14 -05:00
04da6b035e
Add restart option to Fig. Related to #478
...
Signed-off-by: Paul Bonaud <paul@bonaud.fr>
2014-11-08 12:10:11 +01:00
46433c70b6
Ship 1.0.1
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-11-04 14:12:48 +00:00
9abdd337b5
Add signal in the kill CLI commando to send a specific signal to the service
...
Signed-off-by: Raúl Cumplido <raulcumplido@gmail.com>
2014-11-04 12:22:39 +00:00
b47ab2b0f6
Update wordpress url on wordpress example
...
The old url gave a 302 and wordpress 4.0 has also been released.
2014-10-24 23:50:06 +02:00
292fe6640e
Merge pull request #578 from bfirsh/update-url-in-twitter-button
...
Update Twitter button URL
2014-10-23 16:17:38 +01:00
b759b9854a
Update Twitter button URL
...
I originally left it as orchardup.github.io so the number wouldn't roll
back to 0, but people have been tweeting about fig.sh now.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-10-23 16:05:11 +01:00
40943d5c81
Merge pull request #533 from bfirsh/mention-configuration-files-on-home-page
...
Mention names of config files on home page
2014-10-23 11:23:33 +01:00
7f0745d146
Add command line options to the documentation
...
Signed-off-by: Andrea Grandi <a.grandi@gmail.com>
2014-10-23 11:13:40 +01:00
e1ad5b1b99
Merge pull request #575 from bfirsh/fix-google-analytics-code
...
Fix Google Analytics code
2014-10-22 12:48:45 +01:00
98f663bab2
Fix Google Analytics code
...
It was not reporting because our URL changed.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-10-22 12:46:05 +01:00
e1e2b75691
Fix language in Wordpress guide
...
Was still talking about 'environment variables'.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-10-21 11:44:42 +01:00
6580c5609c
Merge pull request #526 from bfirsh/ship-1.0.0
...
WIP: Ship 1.0.0
2014-10-16 18:54:56 +01:00
fed391a23e
Update documentation for TLS and boot2docker
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-10-16 18:46:48 +01:00
4d1b2f1547
Ship 1.0.0
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-10-16 16:27:13 +01:00
d3f88cace5
Mention names of config files on home page
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-10-10 11:06:49 +01:00
872a1b5a5c
Merge pull request #523 from aanand/remove-references-to-docker-osx
...
Remove references to docker-osx
2014-10-06 16:05:06 +01:00
b969988ccb
Remove references to docker-osx
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-10-06 14:21:49 +01:00
a5aac7d59e
Merge pull request #508 from bfirsh/recommend-boot2docker-in-install-instructions
...
Recommend boot2docker in installation instructions
2014-10-06 13:44:23 +01:00
c16f4d4041
Recommend boot2docker in installation instructions
...
Fixes #26
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-10-06 13:14:12 +01:00
d91c458d52
Merge pull request #509 from bfirsh/smarter-binary-urls
...
Use uname to generate binary download URL
2014-10-06 12:35:36 +01:00
f43bfaadaa
Clean up environment variable docs
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-10-06 11:58:16 +01:00
837f368361
Add environment variables to cli.md docs.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2014-10-03 13:47:54 -04:00
f4b599551a
Use uname to generate binary download URL
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-09-30 18:59:18 -07:00
35b217a0a4
Fix the broken URL
...
It was not redirecting to the proper page
Signed-off-by: Przemek Hejman <przemyslaw.hejman@gmail.com>
2014-09-24 13:52:08 -07:00
fc4c35e977
Merge pull request #411 from Banno/fig-pull
...
adding "fig pull [SERVICE]" to pull service images
2014-09-10 23:57:20 +01:00
648c89768b
adding 'fig pull' to cli docs
...
Signed-off-by: Luke Amdor <luke.amdor@gmail.com>
2014-09-10 16:20:14 -05:00
c48ee5caef
Add a new fig command for retrieving the locally bound port of a service.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2014-09-04 22:09:12 -04:00
2827786886
Merge pull request #364 from docker/non-numeric-link-alias
...
Non-numeric link alias
2014-09-04 20:39:18 +01:00
07fa169fd2
Resolves #260 , #301 and #449
...
Adds ~ support and ro mode support for volumes, along with some additional validation.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2014-08-31 02:00:52 -04:00
63bd05d40e
Collapse install instructions into single line
...
For maximum copy and paste happiness
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-08-18 13:36:37 -07:00
59e31ff544
Update docs to remove numeric suffix
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-08-08 13:08:27 -07:00
73bd4aca74
Use hostnames everywhere in docs, add YAML note and deprecate env.md
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-08-08 11:58:41 -07:00
a39460d7b2
Merge pull request #392 from bfirsh/more-official-images
...
More official images
2014-08-07 16:42:36 -07:00
406425a6b9
Use official images in rails tutorial
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-08-07 14:54:59 -07:00
796df302dd
Use official images on getting started guide
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-08-07 14:50:55 -07:00
fc3c12ad90
Update repository URL
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-08-07 14:42:49 -07:00
ba9d744293
Update IRC channel to be #docker-fig
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-08-07 13:39:27 -07:00
d5854bb625
Merge pull request #388 from orchardup/dockerize
...
Point at Docker website and Docker IRC channel
2014-08-07 10:16:16 -07:00
e5f7690137
Point at Docker website and Docker IRC channel
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-08-07 10:15:01 -07:00
0a15e7fe9c
Merge pull request #378 from orchardup/use-ruby-image-for-rails-tutorial
...
Use ruby image for rails docs
2014-08-06 16:51:04 -07:00
255b9419dd
Merge pull request #382 from orchardup/use-official-repositories-in-django-example
...
Use official images in Django example
2014-08-06 16:50:45 -07:00
c63947b5e2
Merge pull request #383 from orchardup/use-official-repos-on-homepage
...
Use official repos on home page
2014-08-06 16:40:48 -07:00
b5d1979d58
Use official repos on home page
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-08-06 16:33:31 -07:00
94aa097bc3
Use official images in Django example
...
Much neater.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-08-06 16:30:27 -07:00
6d64f20ad6
Use hostname on home page example
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-08-06 15:53:45 -07:00
506f54e9c3
Use ruby image for rails docs
...
Fixes #376
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-08-06 13:42:56 -07:00
a6324d6226
Ship 0.5.2
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-07-28 13:17:08 -07:00
7516b67a14
Add link to docker-osx in yml docs
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-07-24 14:18:21 -07:00
5eac04d8d4
Fix typo in yml docs
...
From c09734822e
2014-07-24 14:16:49 -07:00
c09734822e
Add warning for mapping local volumes
...
Mapping local volumes is not currently supported in boot2docker
https://github.com/boot2docker/boot2docker/issues/413
https://github.com/dotcloud/docker/issues/4023
Signed-off-by: Saul Shanabrook <s.shanabrook@gmail.com>
2014-07-24 16:37:14 -04:00
b559880a80
Document missing .yml options
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-07-22 15:37:05 -07:00
f189e299fd
Add canonical link pointing at fig.sh
...
This will keep Google happy.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-07-21 16:20:43 -07:00
d08720247a
Remove absolute link from docs
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-07-21 16:19:55 -07:00
b2e3a91098
Update docs to Docker version 1.1.1
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-07-21 11:30:15 -07:00
3386927f9f
Add fig.sh CNAME to GitHub sites
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-07-19 17:35:38 -07:00
140ced6a3b
Fix and document `dns:` option
...
Closes #240 .
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-07-17 18:11:50 -07:00
6ead40e14c
Update install docs for 0.5.1
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-07-14 16:01:41 -07:00
197fd77b99
Improve some of the .yml options docs
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-07-12 09:55:13 -07:00
36bef254ff
Restructure .yml docs
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-07-12 09:47:43 -07:00
8e265905d3
Add host-in-port-mapping feature to docs and changelog
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-07-12 09:38:18 -07:00
36f4e30dba
Add 0.5.0 to docs
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-07-11 14:16:39 -07:00
4afcdbdb3c
Add docs for volumes_from
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-07-11 12:52:22 -07:00
d1052ff666
Add documention for key-only environment
...
Signed-off-by: Ryan Brainard <brainard@heroku.com>
2014-07-11 10:18:17 -07:00
2a9aef1332
Use concise fig up output in docs
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-07-09 17:34:39 -07:00
95aa61cfe5
Merge pull request #246 from d11wtq/feature/auto_start
...
Feature: `fig up` and `fig run` now start linked containers (closes #31 ).
2014-06-24 14:46:47 +01:00
247691ca44
Remove auto_start option from fig.yml.
...
This option is redundant now that services can be started along with links.
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
2014-06-21 10:39:36 +00:00
0fc9cc65d1
Rename '--only' => '--no-deps'
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
2014-06-21 10:30:36 +00:00
6b8044e92c
add net param support
...
Signed-off-by: Peter Flood <info@whywouldwe.com>
2014-06-19 11:57:55 +01:00
c0fdf7bd39
Use ubuntu:13.10 image to build docs
...
stackbrew/ubuntu and ubuntu are the same thing now.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-06-18 17:26:38 +01:00
eed274c632
Ship 0.4.2
2014-06-18 16:32:23 +01:00
feb8ad7b4c
Update Dockerfile reference/tutorial links
2014-06-16 23:32:50 +01:00
1b5bf6e12a
Merge remote-tracking branch 'upstream/master' into feature/auto_start
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
Conflicts:
tests/fixtures/simple-figfile/fig.yml
tests/unit/project_test.py
2014-06-12 22:05:51 +00:00
6e485df084
Rename --no-links to --only
...
Signed-off-by: d11wtq <chris@w3style.co.uk>
2014-06-11 10:50:45 +00:00
da80eca28c
Update to docs to Docker 1.0.0
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-06-10 14:58:06 -07:00
Charles Chan
Joffrey F
mnowster
Herman Junge
Karol Duleba
Daniel Nephin
Berk Birand
Frank Sachsenheim
Joel Hansson
Maxime Horcholle
Aanand Prasad
Mary Anthony
Mazz Mosley
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
Vincent Demeester
CJ
xwisen
xuxinkun
Michael Chase-Salerno
Kyle Walker
Sam Wing
Fred Lifton
Aleksandr Vinokurov
Steven Dake
Roland Cooper
Laurent Arnoud
Moysés Borges
Patrick Chanezon
Pascal Borreli
likeon
Sven Dowideit
Ashley Penney
Sven Dowideit
Christophe Labouisse
Richard Adams
Jason Bernardino Alonso
Mohammad Salehe
Stephen Quebe
Ben Langfeld
Alexander Leishman
Tyler Fenby
Paul B
Raúl Cumplido
Kevin Simper
Andrea Grandi
mieciu
Luke Amdor
Daniel Nephin
Saul Shanabrook
Ryan Brainard
Chris Corbyn
j0hnsmith