diff --git a/cli.html b/cli.html index 3c93ceb7..fa410356 100644 --- a/cli.html +++ b/cli.html @@ -6,7 +6,7 @@ - +
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.
+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 Docker user guide and the Dockerfile reference.
Second, we define our Python dependencies in a file called requirements.txt:
Django
diff --git a/env.html b/env.html
index 3558f5ed..93b8f9ab 100644
--- a/env.html
+++ b/env.html
@@ -6,7 +6,7 @@
-
+
diff --git a/index.html b/index.html
index a95a4ef6..58ab04ca 100644
--- a/index.html
+++ b/index.html
@@ -6,7 +6,7 @@
-
+
@@ -89,7 +89,7 @@ ADD . /code
WORKDIR /code
RUN pip install -r requirements.txt
-This tells Docker to install Python, our code and our Python dependencies inside a Docker image. For more information on how to write Dockerfiles, see the Dockerfile tutorial and the Dockerfile reference.
+This tells Docker to install Python, our code and our Python dependencies inside a Docker image. For more information on how to write Dockerfiles, see the Docker user guide and the Dockerfile reference.
We then define a set of services using fig.yml:
web:
diff --git a/install.html b/install.html
index 6cf241b3..49dcdec7 100644
--- a/install.html
+++ b/install.html
@@ -6,7 +6,7 @@
-
+
diff --git a/rails.html b/rails.html
index 8f4662be..429f9c35 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. For more information on how to write Dockerfiles, see the Dockerfile tutorial and the Dockerfile reference.
+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 Docker user guide 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 4890f1f1..f6d91dce 100644
--- a/wordpress.html
+++ b/wordpress.html
@@ -6,7 +6,7 @@
-
+
@@ -26,7 +26,7 @@
FROM orchardup/php5
ADD . /code
-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.
+This instructs Docker on how to build an image that contains PHP and Wordpress. For more information on how to write Dockerfiles, see the Docker user guide and the Dockerfile reference.
Next up, fig.yml starts our web service and a separate MySQL instance:
web:
diff --git a/yml.html b/yml.html
index b95afdc8..f8c49027 100644
--- a/yml.html
+++ b/yml.html
@@ -6,7 +6,7 @@
-
+