From f43783e1bfbca5e928da10de19f938a69a762ecb Mon Sep 17 00:00:00 2001 From: Aanand Prasad Date: Fri, 11 Jul 2014 14:34:08 -0700 Subject: [PATCH] update --- cli.html | 11 ++++++++--- django.html | 2 +- env.html | 2 +- index.html | 6 +++--- install.html | 6 +++--- rails.html | 2 +- wordpress.html | 2 +- yml.html | 15 +++++++++++++-- 8 files changed, 31 insertions(+), 15 deletions(-) diff --git a/cli.html b/cli.html index a0ab1e33..a9218503 100644 --- a/cli.html +++ b/cli.html @@ -6,7 +6,7 @@ - +
@@ -56,13 +56,16 @@

For example:

$ fig run web python manage.py shell
-

Note that this will not start any services that the command's service links to. So if, for example, your one-off command talks to your database, you will need to run fig up -d db first.

+

By default, linked services will be started, unless they are already running.

One-off commands are started in new containers with the same config as a normal container for that service, so volumes, links, etc will all be created as expected. The only thing different to a normal container is the command will be overridden with the one specified and no ports will be created in case they collide.

Links are also created between one-off commands and the other containers for that service so you can do stuff like this:

$ fig run db /bin/sh -c "psql -h \$DB_1_PORT_5432_TCP_ADDR -U docker"
+

If you do not want linked containers to be started when running the one-off command, specify the --no-deps flag:

+
$ fig run --no-deps web python manage.py shell
+

scale

Set number of containers to run for a service.

@@ -83,9 +86,11 @@ For example:

Build, (re)create, start and attach to containers for a service.

+

Linked services will be started, unless they are already running.

+

By default, fig up will aggregate the output of each container, and when it exits, all containers will be stopped. If you run fig up -d, it'll start the containers in the background and leave them running.

-

If there are existing containers for a service, fig up will stop and recreate them (preserving mounted volumes with volumes-from), so that changes in fig.yml are picked up.

+

By default if there are existing containers for a service, fig up will stop and recreate them (preserving mounted volumes with volumes-from), so that changes in fig.yml are picked up. If you do no want containers to be stopped and recreated, use fig up --no-recreate. This will still start any stopped containers, if needed.

diff --git a/django.html b/django.html index 6d355b14..ec5d606c 100644 --- a/django.html +++ b/django.html @@ -6,7 +6,7 @@ - +
diff --git a/env.html b/env.html index 5e7ae608..e48634c8 100644 --- a/env.html +++ b/env.html @@ -6,7 +6,7 @@ - +
diff --git a/index.html b/index.html index 3ea9289a..673c2ade 100644 --- a/index.html +++ b/index.html @@ -6,7 +6,7 @@ - +
@@ -117,8 +117,8 @@ Pulling image orchardup/redis... Building web... Starting figtest_redis_1... Starting figtest_web_1... -figtest_redis_1 | [8] 02 Jan 18:43:35.576 # Server started, Redis version 2.8.3 -figtest_web_1 | * Running on http://0.0.0.0:5000/ +redis_1 | [8] 02 Jan 18:43:35.576 # Server started, Redis version 2.8.3 +web_1 | * Running on http://0.0.0.0:5000/

Open up http://localhost:5000 in your browser (or http://localdocker:5000 if you're using docker-osx) and you should see it running!

diff --git a/install.html b/install.html index e1977378..9357f281 100644 --- a/install.html +++ b/install.html @@ -6,7 +6,7 @@ - +
@@ -27,11 +27,11 @@ $ docker-osx shell

Docker has guides for Ubuntu and other platforms in their documentation.

Next, install Fig. On OS X:

-
$ curl -L https://github.com/orchardup/fig/releases/download/0.4.2/darwin > /usr/local/bin/fig
+
$ curl -L https://github.com/orchardup/fig/releases/download/0.5.0/darwin > /usr/local/bin/fig
 $ chmod +x /usr/local/bin/fig
 

 
On 64-bit Linux:

-
$ curl -L https://github.com/orchardup/fig/releases/download/0.4.2/linux > /usr/local/bin/fig
+
$ curl -L https://github.com/orchardup/fig/releases/download/0.5.0/linux > /usr/local/bin/fig
 $ chmod +x /usr/local/bin/fig
 

 
Fig is also available as a Python package if you're on another platform (or if you prefer that sort of thing):

diff --git a/rails.html b/rails.html
index 0936d787..fbd653d8 100644
--- a/rails.html
+++ b/rails.html
@@ -6,7 +6,7 @@
     
     
     
-    
+    
   
   
     

diff --git a/wordpress.html b/wordpress.html
index adde7ff6..10812f41 100644
--- a/wordpress.html
+++ b/wordpress.html
@@ -6,7 +6,7 @@
     
     
     
-    
+    
   
   
     

diff --git a/yml.html b/yml.html
index 1cf89536..7d198b79 100644
--- a/yml.html
+++ b/yml.html
@@ -6,7 +6,7 @@
     
     
     
-    
+    
   
   
     

@@ -65,10 +65,21 @@
 volumes:
  - cache/:/tmp/cache
 
+-- Mount all of the volumes from another service or container
+volumes_from:
+ - service_name
+ - container_name
+
 -- Add environment variables.
+-- Environment variables with only a key are resolved to values on the host 
+-- machine, which can be helpful for secret or host-specific values.
 environment:
   RACK_ENV: development
-
+ SESSION_SECRET: +
+

-- Networking mode. Use the same values as the docker client --net parameter +net: "host"

+