Browse code

Merge pull request #8762 from fredlf/tutorial-tweaks

Tweaks to Dockerfile tutorial

James Turnbull authored on 2014/10/29 11:04:23
Showing 3 changed files
... ...
@@ -14,7 +14,8 @@ successively.
14 14
 This page discusses the specifics of all the instructions you can use in your
15 15
 `Dockerfile`. To further help you write a clear, readable, maintainable
16 16
 `Dockerfile`, we've also written a [`Dockerfile` Best Practices
17
-guide](/articles/dockerfile_best-practices).
17
+guide](/articles/dockerfile_best-practices). Lastly, you can test your
18
+Dockerfile knowledge with the [Dockerfile tutorial](/userguide/level1).
18 19
 
19 20
 ## Usage
20 21
 
... ...
@@ -168,7 +168,6 @@ update and create images.
168 168
 1. We can update a container created from an image and commit the results to an image.
169 169
 2. We can use a `Dockerfile` to specify instructions to create an image.
170 170
 
171
-To learn more, check out the [Dockerfile tutorial](/userguide/level1).
172 171
 
173 172
 ### Updating and committing an image
174 173
 
... ...
@@ -539,6 +538,9 @@ Until now we've seen how to build individual applications inside Docker
539 539
 containers. Now learn how to build whole application stacks with Docker
540 540
 by linking together multiple Docker containers.
541 541
 
542
+Test your Dockerfile knowledge with the
543
+[Dockerfile tutorial](/userguide/level1).
544
+
542 545
 Go to [Linking Containers Together](/userguide/dockerlinks).
543 546
 
544 547
 
... ...
@@ -89,9 +89,8 @@ RUN apt-get install -y <input id="gcc" class="l_fill" type="text"><br>
89 89
     
90 90
 ## What's next?
91 91
 <p>
92
-Thanks for going through our tutorial! We will be posting Level 3 shortly. Follow us on twitter<br>
93
-<a href="https://twitter.com/docker" class="twitter-follow-button" data-show-count="false">Follow @docker</a>
94
-<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
95
-</p>
96
-<p>In the meantime, check out this <a href="http://crosbymichael.com/dockerfile-best-practices.html">blog post</a> by Michael Crosby that describes Dockerfile Best Practices.</p>
92
+Thanks for going through our tutorial! We will be posting Level 3 in the future. 
93
+
94
+To improve your Dockerfile writing skills even further, visit the <a href="https://docs.docker.com/articles/dockerfile_best-practices/">Dockerfile best practices page</a>.
95
+
97 96
 <a title="creating our own images" class="btn btn-primary" href="/userguide/dockerimages/#creating-our-own-images">Back to the Docs!</a>
98 97
\ No newline at end of file