diff --git a/cli.html b/cli.html index be10a90a..b004534b 100644 --- a/cli.html +++ b/cli.html @@ -6,7 +6,7 @@ - +
diff --git a/django.html b/django.html index f55afb25..90f2db76 100644 --- a/django.html +++ b/django.html @@ -6,7 +6,7 @@ - +
@@ -29,7 +29,7 @@ ADD requirements.txt /code/ RUN pip install -r requirements.txt ADD . /code/
-

That'll install our application inside an image with Python installed alongside all of our Python dependencies.

+

That'll install our application inside an image with Python installed alongside all of our Python dependencies. For more information on how to write Dockerfiles, see the Dockerfile tutorial and the Dockerfile reference.

Second, we define our Python dependencies in a file called requirements.txt:

Django
@@ -90,7 +90,7 @@ myapp_web_1 | Django version 1.6.1, using settings 'figexample.settings'
 myapp_web_1 | Starting development server at http://0.0.0.0:8000/
 myapp_web_1 | Quit the server with CONTROL-C.
 
-

And your Django app should be running at localhost:3000 (or localdocker:3000 if you're using docker-osx).

+

And your Django app should be running at localhost:8000 (or localdocker:8000 if you're using docker-osx).

You can also run management commands with Docker. To set up your database, for example, run fig up and in another terminal run:

$ fig run web python manage.py syncdb
diff --git a/env.html b/env.html
index 35651236..ea8fae65 100644
--- a/env.html
+++ b/env.html
@@ -6,7 +6,7 @@
     
     
     
-    
+    
   
   
     
diff --git a/index.html b/index.html index fbbb3071..594d9453 100644 --- a/index.html +++ b/index.html @@ -6,7 +6,7 @@ - +
diff --git a/install.html b/install.html index 2eb74cd7..1950c2e9 100644 --- a/install.html +++ b/install.html @@ -6,7 +6,7 @@ - +
diff --git a/rails.html b/rails.html index fee78df9..53d1fb5e 100644 --- a/rails.html +++ b/rails.html @@ -6,7 +6,7 @@ - +
@@ -30,7 +30,7 @@ ADD Gemfile /myapp/Gemfile RUN bundle install ADD . /myapp
-

That'll put our application code inside an image with Ruby, Bundler and all our dependencies.

+

That'll put our application code inside an image with Ruby, Bundler and all our dependencies. For more information on how to write Dockerfiles, see the Dockerfile tutorial and the Dockerfile reference.

Next, we have a bootstrap Gemfile which just loads Rails. It'll be overwritten in a moment by rails new.

source 'https://rubygems.org'
diff --git a/wordpress.html b/wordpress.html
index e1de676a..5e9bdfd4 100644
--- a/wordpress.html
+++ b/wordpress.html
@@ -6,7 +6,7 @@
     
     
     
-    
+    
   
   
     
@@ -28,6 +28,8 @@ ADD wp-config.php /wordpress/wp-config.php ADD router.php /router.php
+

This instructs Docker on how to build an image that contains PHP and Wordpress. For more information on how to write Dockerfiles, see the Dockerfile tutorial and the Dockerfile reference.

+

Next up, fig.yml starts our web service and a separate MySQL instance:

web:
   build: .
diff --git a/yml.html b/yml.html
index 5d7cefdc..67af6939 100644
--- a/yml.html
+++ b/yml.html
@@ -6,7 +6,7 @@
     
     
     
-    
+