From 525841af1bd6f4115b79a939ae15f6b038ba721c Mon Sep 17 00:00:00 2001 From: Aanand Prasad Date: Mon, 14 Jul 2014 16:09:28 -0700 Subject: [PATCH] update --- cli.html | 2 +- django.html | 2 +- env.html | 2 +- index.html | 2 +- install.html | 6 +-- rails.html | 2 +- wordpress.html | 2 +- yml.html | 134 ++++++++++++++++++++++++++++--------------------- 8 files changed, 86 insertions(+), 66 deletions(-) diff --git a/cli.html b/cli.html index 60628834..efb738cd 100644 --- a/cli.html +++ b/cli.html @@ -6,7 +6,7 @@ - +
diff --git a/django.html b/django.html index ce171a47..c96bde96 100644 --- a/django.html +++ b/django.html @@ -6,7 +6,7 @@ - +
diff --git a/env.html b/env.html index 00acb470..50cabbaa 100644 --- a/env.html +++ b/env.html @@ -6,7 +6,7 @@ - +
diff --git a/index.html b/index.html index 3d1bd1dd..7bdd5895 100644 --- a/index.html +++ b/index.html @@ -6,7 +6,7 @@ - +
diff --git a/install.html b/install.html index 4975953e..88c2fc55 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.5.0/darwin > /usr/local/bin/fig
+
$ curl -L https://github.com/orchardup/fig/releases/download/0.5.1/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.5.0/linux > /usr/local/bin/fig
+
$ curl -L https://github.com/orchardup/fig/releases/download/0.5.1/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 2e5f280d..4e6765d5 100644
--- a/rails.html
+++ b/rails.html
@@ -6,7 +6,7 @@
     
     
     
-    
+    
   
   
     

diff --git a/wordpress.html b/wordpress.html
index 075f47aa..dec9f58f 100644
--- a/wordpress.html
+++ b/wordpress.html
@@ -6,7 +6,7 @@
     
     
     
-    
+    
   
   
     

diff --git a/yml.html b/yml.html
index 82305687..3d22bf55 100644
--- a/yml.html
+++ b/yml.html
@@ -6,7 +6,7 @@
     
     
     
-    
+    
   
   
     

@@ -22,65 +22,85 @@
 
Each service defined in fig.yml must specify exactly one of image or build. Other keys are optional, and are analogous to their docker run command-line counterparts.

 
 
As with docker run, options specified in the Dockerfile (e.g. CMD, EXPOSE, VOLUME, ENV) are respected by default - you don't need to specify them again in fig.yml.

-
-- Tag or partial image ID. Can be local or remote - Fig will attempt to pull
--- if it doesn't exist locally.
-image: ubuntu
-image: orchardup/postgresql
-image: a4bc65fd
 
--- Path to a directory containing a Dockerfile. Fig will build and tag it with
--- a generated name, and use that image thereafter.
-build: /path/to/build/dir
+
image

 
--- Override the default command.
-command: bundle exec thin -p 3000
-
--- Link to containers in another service. Optionally specify an alternate name
--- for the link, which will determine how environment variables are prefixed,
--- e.g. "db" -> DB_1_PORT, "db:database" -> DATABASE_1_PORT
-links:
- - db
- - db:database
- - redis
-
--- Expose ports. Either specify both ports (HOST:CONTAINER), or just the
--- container port (a random host port will be chosen).
--- Note: When mapping ports in the HOST:CONTAINER format, you may experience
--- erroneous results when using a container port lower than 60, because YAML
--- will parse numbers in the format "xx:yy" as sexagesimal (base 60). For
--- this reason, we recommend always explicitly specifying your port mappings
--- as strings.
-ports:
- - "3000"
- - "8000:8000"
- - "49100:22"
- - "127.0.0.1:8001:8001"
-
--- Expose ports without publishing them to the host machine - they'll only be
--- accessible to linked services. Only the internal port can be specified.
-expose:
- - "3000"
- - "8000"
-
--- Map volumes from the host machine (HOST:CONTAINER).
-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:
+
Tag or partial image ID. Can be local or remote - Fig will attempt to pull if it doesn't exist locally.

+
image: ubuntu
+image: orchardup/postgresql
+image: a4bc65fd
 

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

-

+
build

+
+
Path to a directory containing a Dockerfile. Fig will build and tag it with a generated name, and use that image thereafter.

+
build: /path/to/build/dir
+

+
command

+
+
Override the default command.

+
command: bundle exec thin -p 3000
+

+
links

+
+
Link to containers in another service. Optionally specify an alternate name for the link, which will determine how environment variables are prefixed, e.g. db -> DB_1_PORT, db:database -> DATABASE_1_PORT

+
links:
+ - db
+ - db:database
+ - redis
+

+
ports

+
+
Expose ports. Either specify both ports (HOST:CONTAINER), or just the container port (a random host port will be chosen).

+
+
Note: When mapping ports in the HOST:CONTAINER format, you may experience erroneous results when using a container port lower than 60, because YAML will parse numbers in the format xx:yy as sexagesimal (base 60). For this reason, we recommend always explicitly specifying your port mappings as strings.

+
ports:
+ - "3000"
+ - "8000:8000"
+ - "49100:22"
+ - "127.0.0.1:8001:8001"
+

+
expose

+
+
Expose ports without publishing them to the host machine - they'll only be accessible to linked services. Only the internal port can be specified.

+
expose:
+ - "3000"
+ - "8000"
+

+
volumes

+
+
Mount paths as volumes, optionally specifying a path on the host machine (HOST:CONTAINER).

+
volumes:
+ - /var/lib/mysql
+ - cache/:/tmp/cache
+

+
volumes_from

+
+
Mount all of the volumes from another service or container.

+
volumes_from:
+ - service_name
+ - container_name
+

+
environment

+
+
Add environment variables. You can use either an array or a dictionary.

+
+
Environment variables with only a key are resolved to their values on the machine Fig is running on, which can be helpful for secret or host-specific values.

+
environment:
+  RACK_ENV: development
+  SESSION_SECRET:
+
+environment:
+  - RACK_ENV=development
+  - SESSION_SECRET
+

+
net

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

+
net: "bridge"
+net: "none"
+net: "container:[name or id]"
+net: "host"
+