From b8dc8b048bc9f8aa59f756d297c9da205c092ddf Mon Sep 17 00:00:00 2001 From: Ben Firshman Date: Wed, 5 Nov 2014 12:08:27 +0000 Subject: [PATCH] update --- cli.html | 22 ++++++++++++++++++++-- django.html | 4 ++-- env.html | 4 ++-- index.html | 8 ++++---- install.html | 6 +++--- rails.html | 4 ++-- wordpress.html | 6 +++--- yml.html | 4 ++-- 8 files changed, 38 insertions(+), 20 deletions(-) diff --git a/cli.html b/cli.html index 89894a86..3c9a47d9 100644 --- a/cli.html +++ b/cli.html @@ -6,7 +6,7 @@ - + @@ -24,6 +24,24 @@

Run fig [COMMAND] --help for full usage.

+

Options

+ +

--verbose

+ +

Show more output

+ +

--version

+ +

Print version and exit

+ +

-f, --file FILE

+ +

Specify an alternate fig file (default: fig.yml)

+ +

-p, --project-name NAME

+ +

Specify an alternate project name (default: directory name)

+

Commands

build

@@ -162,7 +180,7 @@ For example:

- +
diff --git a/django.html b/django.html index 6f8c8b41..93c03d6e 100644 --- a/django.html +++ b/django.html @@ -6,7 +6,7 @@ - + @@ -128,7 +128,7 @@ myapp_web_1 | Quit the server with CONTROL-C.
- +
diff --git a/env.html b/env.html index beed966f..50f84b51 100644 --- a/env.html +++ b/env.html @@ -6,7 +6,7 @@ - + @@ -77,7 +77,7 @@ Fully qualified container name, e.g. DB_1_NAME=/myapp_web_1/myapp_db_1 - + diff --git a/index.html b/index.html index 5622330b..98ddea81 100644 --- a/index.html +++ b/index.html @@ -6,7 +6,7 @@ - + @@ -20,13 +20,13 @@

Fast, isolated development environments using Docker.

-

Define your app's environment with Docker so it can be reproduced anywhere:

+

Define your app's environment with a Dockerfile so it can be reproduced anywhere:

FROM python:2.7
 ADD . /code
 WORKDIR /code
 RUN pip install -r requirements.txt
-

Define the services that make up your app so they can be run together in an isolated environment:

+

Define the services that make up your app in fig.yml so they can be run together in an isolated environment:

web:
   build: .
   command: python app.py
@@ -173,7 +173,7 @@ figtest_web_1     /bin/sh -c python app.py   Up      5000->5000/tcp
 
         

           
-          
+
diff --git a/install.html b/install.html index d69968f8..baba2417 100644 --- a/install.html +++ b/install.html @@ -6,7 +6,7 @@ - + @@ -30,7 +30,7 @@

There are also guides for Ubuntu and other platforms in Docker’s documentation.

Next, install Fig:

-
curl -L https://github.com/docker/fig/releases/download/1.0.0/fig-`uname -s`-`uname -m` > /usr/local/bin/fig; chmod +x /usr/local/bin/fig
+
curl -L https://github.com/docker/fig/releases/download/1.0.1/fig-`uname -s`-`uname -m` > /usr/local/bin/fig; chmod +x /usr/local/bin/fig
 

 
Releases are available for OS X and 64-bit Linux. Fig is also available as a Python package if you're on another platform (or if you prefer that sort of thing):

 
$ sudo pip install -U fig
@@ -70,7 +70,7 @@
 
         

           
-          
+
diff --git a/rails.html b/rails.html index 69814f5c..901ff2f4 100644 --- a/rails.html +++ b/rails.html @@ -6,7 +6,7 @@ - + @@ -133,7 +133,7 @@ myapp_web_1 | [2014-01-17 17:16:29] INFO WEBrick::HTTPServer#start: pid=1 port=
- +
diff --git a/wordpress.html b/wordpress.html index ecdefb37..818d65a0 100644 --- a/wordpress.html +++ b/wordpress.html @@ -6,7 +6,7 @@ - + @@ -21,7 +21,7 @@

Getting started with Fig and Wordpress

Fig makes it nice and easy to run Wordpress in an isolated environment. Install Fig, then download Wordpress into the current directory:

-
$ curl http://wordpress.org/wordpress-3.8.1.tar.gz | tar -xvzf -
+
$ curl https://wordpress.org/latest.tar.gz | tar -xvzf -
 

 
This will create a directory called wordpress, which you can rename to the name of your project if you wish. Inside that directory, we create Dockerfile, a file that defines what environment your app is going to run in:

 
FROM orchardup/php5
@@ -124,7 +124,7 @@ if(file_exists($root.$path))
 
         

           
-          
+
diff --git a/yml.html b/yml.html index b4b7dc43..8000ed6f 100644 --- a/yml.html +++ b/yml.html @@ -6,7 +6,7 @@ - + @@ -167,7 +167,7 @@ privileged: true
- +