Browse code

Don't put dockerfiles in one continuous code block

Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>

Aidan Hobson Sayers authored on 2015/10/07 06:58:23
Showing 1 changed files
... ...
@@ -1166,45 +1166,50 @@ or a signal name in the format SIGNAME, for instance SIGKILL.
1166 1166
 
1167 1167
 ## Dockerfile examples
1168 1168
 
1169
-    # Nginx
1170
-    #
1171
-    # VERSION               0.0.1
1172
-
1173
-    FROM      ubuntu
1174
-    MAINTAINER Victor Vieux <victor@docker.com>
1175
-
1176
-    LABEL Description="This image is used to start the foobar executable" Vendor="ACME Products" Version="1.0"
1177
-    RUN apt-get update && apt-get install -y inotify-tools nginx apache2 openssh-server
1178
-
1179
-    # Firefox over VNC
1180
-    #
1181
-    # VERSION               0.3
1182
-
1183
-    FROM ubuntu
1169
+```
1170
+# Nginx
1171
+#
1172
+# VERSION               0.0.1
1184 1173
 
1185
-    # Install vnc, xvfb in order to create a 'fake' display and firefox
1186
-    RUN apt-get update && apt-get install -y x11vnc xvfb firefox
1187
-    RUN mkdir ~/.vnc
1188
-    # Setup a password
1189
-    RUN x11vnc -storepasswd 1234 ~/.vnc/passwd
1190
-    # Autostart firefox (might not be the best way, but it does the trick)
1191
-    RUN bash -c 'echo "firefox" >> /.bashrc'
1174
+FROM      ubuntu
1175
+MAINTAINER Victor Vieux <victor@docker.com>
1192 1176
 
1193
-    EXPOSE 5900
1194
-    CMD    ["x11vnc", "-forever", "-usepw", "-create"]
1177
+LABEL Description="This image is used to start the foobar executable" Vendor="ACME Products" Version="1.0"
1178
+RUN apt-get update && apt-get install -y inotify-tools nginx apache2 openssh-server
1179
+```
1195 1180
 
1196
-    # Multiple images example
1197
-    #
1198
-    # VERSION               0.1
1181
+```
1182
+# Firefox over VNC
1183
+#
1184
+# VERSION               0.3
1185
+
1186
+FROM ubuntu
1187
+
1188
+# Install vnc, xvfb in order to create a 'fake' display and firefox
1189
+RUN apt-get update && apt-get install -y x11vnc xvfb firefox
1190
+RUN mkdir ~/.vnc
1191
+# Setup a password
1192
+RUN x11vnc -storepasswd 1234 ~/.vnc/passwd
1193
+# Autostart firefox (might not be the best way, but it does the trick)
1194
+RUN bash -c 'echo "firefox" >> /.bashrc'
1195
+
1196
+EXPOSE 5900
1197
+CMD    ["x11vnc", "-forever", "-usepw", "-create"]
1198
+```
1199 1199
 
1200
-    FROM ubuntu
1201
-    RUN echo foo > bar
1202
-    # Will output something like ===> 907ad6c2736f
1200
+```
1201
+# Multiple images example
1202
+#
1203
+# VERSION               0.1
1203 1204
 
1204
-    FROM ubuntu
1205
-    RUN echo moo > oink
1206
-    # Will output something like ===> 695d7793cbe4
1205
+FROM ubuntu
1206
+RUN echo foo > bar
1207
+# Will output something like ===> 907ad6c2736f
1207 1208
 
1208
-    # You᾿ll now have two images, 907ad6c2736f with /bar, and 695d7793cbe4 with
1209
-    # /oink.
1209
+FROM ubuntu
1210
+RUN echo moo > oink
1211
+# Will output something like ===> 695d7793cbe4
1210 1212
 
1213
+# You᾿ll now have two images, 907ad6c2736f with /bar, and 695d7793cbe4 with
1214
+# /oink.
1215
+```