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

436 Commits

Author SHA1 Message Date
Ben Firshman 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
delbert@umn.edu df87bd91c8 Added devices configuration option 
Signed-off-by: Dan Elbert <dan.elbert@gmail.com>
 2015-05-11 10:50:58 -05:00
Daniel Nephin 99f2a3a583 Merge pull request #1396 from albers/completion-doc 
Fix markdown formatting issue
 2015-05-07 14:04:16 -04:00
Daniel Nephin 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
Harald Albers d6223371d6 Fix markdown formatting issue 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-05-07 04:41:12 -07:00
Vincent Demeester 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
CJ b06294399a See #1335: Added --read-only 
Signed-off-by: CJ <lim@chernjie.com>
 2015-05-02 23:39:39 +08:00
Daniel Nephin 6c95eed781 Merge pull request #1269 from aanand/labels 
Implement 'labels' option
 2015-04-30 20:49:11 -04:00
Aanand Prasad 2e6bc078fb Implement 'labels' option 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-29 16:45:18 +01:00
Aanand Prasad fed4377ef6 Merge pull request #1351 from mchasal/1301-alphabetize_usage 
Fix for #1301, Alphabetize Commands
 2015-04-29 14:21:46 +01:00
Daniel Nephin a89bc304f6 Merge pull request #1075 from KyleJamesWalker/master 
Support alternate Dockerfile name.
 2015-04-27 10:06:43 -04:00
Daniel Nephin 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
Ben Firshman 3af56e1602 Merge pull request #1200 from chanezon/1148-pat-paul 
paulczar fixes plus example file
 2015-04-27 14:54:14 +01:00
Aanand Prasad 16f8106149 Merge pull request #1158 from chernjie/addhosts 
Add extra_hosts to yml configuration --add-hosts
 2015-04-27 12:26:29 +01:00
xwisen 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
xuxinkun 688f82c1cf Add cpuset config. 
Signed-off-by: xuxinkun <xuxinkun@gmail.com>
 2015-04-26 00:14:52 +08:00
Michael Chase-Salerno 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
Daniel Nephin 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
Kyle Walker d17c4d27fa Support alternate Dockerfile name. 
Signed-off-by: Kyle James Walker <KyleJamesWalker@gmail.com>
 2015-04-24 08:30:36 -07:00
CJ 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
Sam Wing 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
Aanand Prasad 8b5015c10f Bump 1.2.0 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-16 17:48:28 +01:00
Fred Lifton 2a442ec6d9 Adds Where to Get Help section 
Signed-off-by: Fred Lifton <fred.lifton@docker.com>
 2015-04-09 16:23:25 -07:00
Aleksandr Vinokurov 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
Ben Firshman a1cd00e3f0 Merge pull request #1251 from aanand/extends-guide 
Add tutorial and reference for `extends`
 2015-04-08 15:47:39 +01:00
Aanand Prasad 4f95e81c6d Merge pull request #1166 from spk/fix_example_env_file 
Docs: fix env_file example
 2015-04-07 15:52:10 +01:00
Aanand Prasad 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
Aanand Prasad f3f7f000fe Add tutorial and reference for `extends` 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-07 13:46:14 +01:00
Fred Lifton 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
Steven Dake 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
Fred Lifton 530d7af5cf Merge pull request #1253 from aanand/production-guide 
Add guide to using Compose in production
 2015-04-06 10:49:49 -07:00
Aanand Prasad 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
Fred Lifton eb073c53f4 Merge pull request #1249 from asveepay/update_doc 
Update install docs for permission denied error
 2015-04-03 12:31:38 -07:00
Roland Cooper d866415b9a Update install docs for permission denied error 
Signed-off-by: Roland Cooper <rcooper@enova.com>
 2015-04-03 12:21:15 -05:00
Laurent Arnoud 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
Moysés Borges 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
Patrick Chanezon cec6dc28bb implemented @fredl suggestions 
Signed-off-by: Patrick Chanezon <patlist@chanezon.com>
 2015-03-27 17:12:29 -07:00
Patrick Chanezon 98dd0cd1f8 implemented @aanand comments 
Signed-off-by: Patrick Chanezon <patlist@chanezon.com>
 2015-03-27 13:26:51 -07:00
Patrick Chanezon c441ac90d6 paulczar fixes plus example file 
Signed-off-by: Patrick Chanezon <patlist@chanezon.com>
 2015-03-26 16:35:53 -07:00
Pascal Borreli 59f04c6e29 Fixed typo 
Signed-off-by: Pascal Borreli <pascal@borreli.com>
 2015-03-26 19:03:06 +00:00
Aanand Prasad 965426e39b Revert "Add 'labels:' config option" 
This reverts commit 721327110d.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-23 15:04:04 -07:00
Aanand Prasad 721327110d Add 'labels:' config option 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-20 18:12:04 -07:00
Aanand Prasad 4c582e4352 Implement `extends` 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-20 15:45:16 -07:00
Aanand Prasad 528bed9ef6 Fix environment resolution 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-13 14:22:28 +00:00
likeon 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
Ben Firshman 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
Fred Lifton 882dc673ce Edits and revisions to Compose Quickstart guides 2015-02-26 18:58:06 -08:00
Ben Firshman 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
Ben Firshman 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
Aanand Prasad 4ac02bfca6 Ship 1.1.0 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-25 18:16:44 +00:00
Aanand Prasad 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
Aanand Prasad 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
Aanand Prasad bb943d5cb5 Update URLs in documentation 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-25 14:58:03 +00:00
Ben Firshman 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
Sven Dowideit 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
Aanand Prasad 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
Ben Firshman 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
Sven Dowideit 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
Sven Dowideit 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
Aanand Prasad 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
Ben Firshman e3eccd1047 Merge pull request #979 from aanand/fix-env-docs 
Update environment variable names in docs
 2015-02-19 14:34:48 +00:00
Ben Firshman d32994c250 Add title to docs index 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-02-19 14:34:08 +00:00
Aanand Prasad a516d61b49 Update environment variable names in docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-18 11:39:57 +00:00
Aanand Prasad 6eb1c8896f Merge pull request #952 from fredlf/cli-doc-revision 
Revises Compose cli reference
 2015-02-18 11:38:50 +00:00
Aanand Prasad 5e8bcd2d29 Rejig introduction 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-17 10:58:51 +00:00
Ben Firshman 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
Fred Lifton 4a33686787 Revises Compose cli reference 2015-02-11 18:22:36 -08:00
Fred Lifton 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
Aanand Prasad 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
Ashley Penney 75247e5a54 Fix a small typo. 2015-01-31 20:00:04 -05:00
Sven Dowideit 3b7ea5c055 resolve most of my comments 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-01-30 21:27:57 +10:00
Fred Lifton 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
Sven Dowideit 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
Aanand Prasad deb2de3c07 Ship 1.1.0-rc2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-29 18:00:10 -05:00
Daniel Nephin 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
Aanand Prasad 43fdae8bc6 Ship 1.1.0-rc1 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 22:42:59 +00:00
Aanand Prasad 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
Aanand Prasad 724be54f09 Manual fixes to docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:00:23 +00:00
Aanand Prasad e3c4a662d9 Find-and-replace on docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:00:23 +00:00
Aanand Prasad 72095f54b2 Merge pull request #639 from albers/bash-completion 
Bash completion for fig command
 2015-01-13 17:46:42 +00:00
Christophe Labouisse 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
Daniel Nephin 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
Harald Albers 2406a3936a Documentation for bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-01-08 15:18:39 +01:00
Richard Adams 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
Richard Adams 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
Christophe Labouisse 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
Jason Bernardino Alonso 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
Aanand Prasad 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
Mohammad Salehe 3c105c6db2 Fix typo in dns_search documentation 
Signed-off-by: Mohammad Salehe <salehe+dev@gmail.com>
 2014-12-15 16:37:32 +03:30
Mohammad Salehe 5182bd0968 Add dns_search support in yml config 
Signed-off-by: Mohammad Salehe <salehe@gmail.com>
 2014-12-15 16:37:31 +03:30
Stephen Quebe 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
Daniel Nephin 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
Ben Langfeld 98b6d7be78 Add support for 'env_file' key 
Signed-off-by: Ben Langfeld <ben@langfeld.me>
 2014-12-08 23:42:09 +00:00
Alexander Leishman ab77cef7ab Add favicon.ico and links in header 
Signed-off-by: Alexander Leishman <leishman3@gmail.com>
 2014-12-08 13:04:02 -08:00
Tyler Fenby 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
Ben Firshman e9d946b038 Merge pull request #594 from popox/restart-option 
Add restart option to Fig.
 2014-12-08 08:43:27 -08:00
Daniel Nephin 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
Paul B 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
Ben Firshman 46433c70b6 Ship 1.0.1 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-11-04 14:12:48 +00:00
Raúl Cumplido 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
Kevin Simper 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
Aanand Prasad 292fe6640e Merge pull request #578 from bfirsh/update-url-in-twitter-button 
Update Twitter button URL
 2014-10-23 16:17:38 +01:00
Ben Firshman 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
Aanand Prasad 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
Andrea Grandi 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
Aanand Prasad e1ad5b1b99 Merge pull request #575 from bfirsh/fix-google-analytics-code 
Fix Google Analytics code
 2014-10-22 12:48:45 +01:00
Ben Firshman 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
Aanand Prasad 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
Aanand Prasad 6580c5609c Merge pull request #526 from bfirsh/ship-1.0.0 
WIP: Ship 1.0.0
 2014-10-16 18:54:56 +01:00
Aanand Prasad fed391a23e Update documentation for TLS and boot2docker 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-16 18:46:48 +01:00
Ben Firshman 4d1b2f1547 Ship 1.0.0 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-16 16:27:13 +01:00
Ben Firshman 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
Ben Firshman 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
Aanand Prasad b969988ccb Remove references to docker-osx 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-06 14:21:49 +01:00
Aanand Prasad 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
Ben Firshman 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
Aanand Prasad 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
Aanand Prasad f43bfaadaa Clean up environment variable docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-06 11:58:16 +01:00
Daniel Nephin 837f368361 Add environment variables to cli.md docs. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-10-03 13:47:54 -04:00
Ben Firshman 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
mieciu 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
Ben Firshman 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
Luke Amdor 648c89768b adding 'fig pull' to cli docs 
Signed-off-by: Luke Amdor <luke.amdor@gmail.com>
 2014-09-10 16:20:14 -05:00
Daniel Nephin 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
Ben Firshman 2827786886 Merge pull request #364 from docker/non-numeric-link-alias 
Non-numeric link alias
 2014-09-04 20:39:18 +01:00
Daniel Nephin 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
Ben Firshman 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
Aanand Prasad 59e31ff544 Update docs to remove numeric suffix 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-08-08 13:08:27 -07:00
Aanand Prasad 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
Aanand Prasad a39460d7b2 Merge pull request #392 from bfirsh/more-official-images 
More official images
 2014-08-07 16:42:36 -07:00
Ben Firshman 406425a6b9 Use official images in rails tutorial 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-07 14:54:59 -07:00
Ben Firshman 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
Ben Firshman fc3c12ad90 Update repository URL 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-07 14:42:49 -07:00
Ben Firshman 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
Aanand Prasad d5854bb625 Merge pull request #388 from orchardup/dockerize 
Point at Docker website and Docker IRC channel
 2014-08-07 10:16:16 -07:00
Ben Firshman 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
Aanand Prasad 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
Aanand Prasad 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
Aanand Prasad 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
Ben Firshman b5d1979d58 Use official repos on home page 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-06 16:33:31 -07:00
Ben Firshman 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
Ben Firshman 6d64f20ad6 Use hostname on home page example 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-06 15:53:45 -07:00
Ben Firshman 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
Aanand Prasad a6324d6226 Ship 0.5.2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-28 13:17:08 -07:00
Ben Firshman 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
Ben Firshman 5eac04d8d4 Fix typo in yml docs 
From c09734822e

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-24 14:16:49 -07:00
Saul Shanabrook 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
Aanand Prasad b559880a80 Document missing .yml options 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-22 15:37:05 -07:00
Ben Firshman 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
Ben Firshman d08720247a Remove absolute link from docs 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-21 16:19:55 -07:00
Ben Firshman 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
Ben Firshman 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
Aanand Prasad 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
Aanand Prasad 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
Aanand Prasad 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
Aanand Prasad 36bef254ff Restructure .yml docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-12 09:47:43 -07:00
Aanand Prasad 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
Ben Firshman 36f4e30dba Add 0.5.0 to docs 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-11 14:16:39 -07:00
Ben Firshman 4afcdbdb3c Add docs for volumes_from 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-11 12:52:22 -07:00
Ryan Brainard d1052ff666 Add documention for key-only environment 
Signed-off-by: Ryan Brainard <brainard@heroku.com>
 2014-07-11 10:18:17 -07:00
Ben Firshman 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
Ben Firshman 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
Chris Corbyn 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
Chris Corbyn 0fc9cc65d1 Rename '--only' => '--no-deps' 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-21 10:30:36 +00:00
j0hnsmith 6b8044e92c add net param support 
Signed-off-by: Peter Flood <info@whywouldwe.com>
 2014-06-19 11:57:55 +01:00
Ben Firshman 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
Ben Firshman eed274c632 Ship 0.4.2 2014-06-18 16:32:23 +01:00
Aanand Prasad feb8ad7b4c Update Dockerfile reference/tutorial links 2014-06-16 23:32:50 +01:00
Chris Corbyn 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
d11wtq 6e485df084 Rename --no-links to --only 
Signed-off-by: d11wtq <chris@w3style.co.uk>
 2014-06-11 10:50:45 +00:00
Ben Firshman 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
d11wtq 1d1e23611b Rename --keep-old to --no-recreate 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:51 +00:00
d11wtq 74e067c6e6 Document --keep-old flag in CLI reference 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:50 +00:00
d11wtq 85b9619799 Document 'auto_start' in fig.yml 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:50 +00:00
Ben Firshman 2ecd366905 Add PYTHONUNBUFFERED=1 to Django tutorial 2014-05-22 14:15:17 +01:00
Aanand Prasad 8394e84099 Compress the sidebar a bit 2014-05-14 16:32:39 +01:00
Ben Firshman adda3a7f79 Put Orchard in docs sidebar 2014-05-14 13:05:40 +01:00
Ben Firshman cd1c8b2f09 Update docs to Docker 0.11.1 2014-05-09 10:53:12 +01:00
Aanand Prasad 98ceb62202 Update Fig version on install page 2014-05-08 13:10:13 +01:00
Ben Firshman 3c5e818b49 Update install docs for Docker 0.11.0 2014-05-08 12:21:46 +01:00
Aanand Prasad a3d8f7d113 Remove hash from gif URL 2014-05-06 17:13:56 +01:00
Ben Firshman 3d4b5cfbfe Update version of docker-osx 2014-05-01 15:34:21 +01:00
Aanand Prasad 33b057bfaf Update tag in docker-osx download URL 2014-05-01 10:51:42 +01:00
Aanand Prasad 629fe771df Update domain in docker-osx download URL 2014-04-30 16:37:20 +01:00
Aanand Prasad 5e6f175b5f Update download URLs on install page 2014-04-30 16:26:46 +01:00
Aanand Prasad fd85be2c9e Update docker[-osx] version in install docs 2014-04-28 18:22:11 +01:00
Ben Firshman 530afba5cb Merge pull request #150 from muff1nman/utf8 
Jekyll errors out with utf8 input
 2014-04-06 16:01:32 +01:00
Aanand Prasad a3374ac51d Update install instructions on homepage 
Closes #161
 2014-03-25 12:26:33 +00:00
Aaditya Talwai b0ec54b6f7 Update django.md: Fix link to fig.yml reference 2014-03-12 15:45:32 -07:00
Andrew DeMaria 2360bf0eb9 Use utf8 when building docs 2014-03-08 18:28:41 -07:00
Ben Firshman 14e778b3de Update version in install docs 2014-03-05 14:57:24 +00:00
Aanand Prasad d1a52d2b1a Remove unneeded 'ports' entries from WP and Django fig.ymls in docs 2014-03-04 21:54:10 +00:00
Aanand Prasad 2d98071e55 Support 'expose' config option, like docker's --expose 
Exposes ports to linked services without publishing them to the world.
 2014-03-04 18:06:52 +00:00
Ben Firshman 6813cb86a2 Update version in installation docs 2014-03-04 11:53:16 +00:00
Aanand Prasad be1ba818e4 Document link aliases 2014-03-03 18:00:27 +00:00
Ben Firshman b0ac88fd06 Merge pull request #78 from orchardup/document-docker-version 
Document which versions of Docker Fig supports
 2014-03-03 17:02:13 +00:00
Aanand Prasad 348ba0818f Reformat comments in YAML reference for readability 2014-03-03 16:23:52 +00:00
Aanand Prasad f79e0e588e Reword port warning in YAML reference, remove it from README 2014-03-03 16:22:02 +00:00
Aanand Prasad e6016bd5b4 Merge pull request #104 from Gazler/documentation/port-strings 
Documentation: Include notes on mapping ports
 2014-03-03 16:21:31 +00:00
Ben Firshman 17b9801ec9 Document what version of Docker is supported 2014-03-03 15:43:10 +00:00
Aanand Prasad e550451c69 Merge pull request #25 from orchardup/ship-binaries 
Ship OS X binaries
 2014-03-03 15:29:59 +00:00
Ben Firshman 29f7b78deb Add installation instructions for binaries 2014-03-03 15:20:09 +00:00
Gary Rennie b06d37f885 Documentation: Include notes on mapping ports 
When mapping ports as strings there is an issue with the way YAML parses
numbers in the format "xx:yy" where yy is less than 60 - this issue is
now included in the documentation.

This fixes #103
 2014-03-03 13:37:15 +00:00
Aanand Prasad c66e18c913 Fix Dockerfile reference URL in docs 2014-03-01 11:28:31 +00:00
Ben Firshman b789eca421 Update Orchard description 2014-02-28 19:15:39 +00:00
Ben Firshman 496a1d3bfe Update docker-osx version to 0.8.0 2014-02-24 18:33:38 +00:00
Ben Firshman 1327e293f6 Add Dockerfile filename to wordpress guide 2014-02-18 10:56:21 +00:00
Ben Firshman 2edc372f41 Update Wordpress guide so you can edit code 2014-02-18 10:52:24 +00:00
Ben Firshman 9faa7e47ed Lock version of docker-osx on home page 2014-02-04 17:15:14 -08:00
Ben Firshman fea3bc2eb1 Install docker-osx from tag 2014-02-04 15:47:12 -08:00
Ben Firshman 19c0c9bf06 Specify working docker-osx version in docs 2014-02-03 16:00:01 -08:00
Ben Firshman 62607f4f04 Merge pull request #67 from orchardup/link-services-to-themselves 
Link services to themselves
 2014-01-31 02:46:52 -08:00
Ben Firshman e4e9f0bc19 Link services to themselves 
E.g. `fig run db ...` will be able to access the db service.
 2014-01-30 13:11:23 +00:00
Ben Firshman e0637990aa Document how one-off commands are configured 2014-01-30 10:50:59 +00:00
Ben Firshman 03842f92e8 Document how to see env vars for a service 2014-01-30 10:49:31 +00:00
Damian Moore 80279f71d8 Fixed error where Django can't connect to Postgres because psycopg2 is not installed 2014-01-29 20:01:11 +00:00
Ben Firshman c270c13baa Move command to fig.yml 
As done in the getting started guides. Easier to explain like this,
I think.
 2014-01-28 14:39:21 +00:00
Ben Firshman 880bc0d8e3 Fix link to running Django example 2014-01-28 12:46:22 +00:00
Ben Firshman 89d2653662 Add links to Dockerfile docs 2014-01-28 12:46:22 +00:00
Ben Firshman 9967d706e9 Simplify getting started guide 
and add links off to dockerfile docs
 2014-01-28 10:32:55 +00:00
Ben Firshman d5bc521ab0 Use new envvar format in getting started guide 2014-01-28 10:25:02 +00:00
Ben Firshman 2883b5be6b Add note about postgres image settings 2014-01-28 00:19:38 +00:00
Ben Firshman b6d0b8468b Fix ordering in dockerfile 2014-01-28 00:08:11 +00:00
Aanand Prasad 140ccc7d4e Wordpress getting-started guide 2014-01-27 21:43:22 +00:00
Ben Firshman b4cbcbefa6 Remove project name from envvars in docs 2014-01-27 21:12:14 +00:00
Ben Firshman 9049f4e378 Add IRC to docs 2014-01-27 21:05:16 +00:00
Ben Firshman 0e58c05361 Cache bust docs CSS 2014-01-27 20:36:57 +00:00
Ben Firshman 818516f150 Make logo a link to index 2014-01-27 20:33:41 +00:00
Ben Firshman 837593e1ab Clarify line about services 2014-01-27 19:38:30 +00:00
Ben Firshman cc29b21bfc Clearer introduction 2014-01-27 18:16:57 +00:00
Aanand Prasad 92a2deb979 Update homepage title 2014-01-27 18:05:42 +00:00
Aanand Prasad 40fad23e0b Fix Dockerfile in Rails example 
was missing libpq-dev
 2014-01-27 18:00:47 +00:00
Ben Firshman 6c8472dd67 Make strapline smaller on mobile 2014-01-27 18:00:47 +00:00
Aanand Prasad a9838e9116 Update environment variable names in reference 
Scheme was changed in 3e7e6e7656
 2014-01-27 18:00:47 +00:00
Aanand Prasad 01d0e49a1c New website 2014-01-27 18:00:47 +00:00
Aanand Prasad f60621ee1b Move docs to master branch 
- build with script/build-docs
- deploy with script/deploy-docs
 2014-01-27 11:51:15 +00:00