docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove some trailing whitespace.

This commit is contained in:
Caleb Spare 2013-07-08 01:14:01 -07:00
parent 2b0ebf5d32
commit 416fdaa3d5
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
docs/sources/use/builder.rst
View File

@ -30,7 +30,7 @@ build succeeds:
``docker build -t shykes/myapp .`` ``docker build -t shykes/myapp .``
Docker will run your steps one-by-one, committing the result if necessary, Docker will run your steps one-by-one, committing the result if necessary,
before finally outputting the ID of your new image. before finally outputting the ID of your new image.
2. Format 2. Format
@ -43,7 +43,7 @@ The Dockerfile format is quite simple:
# Comment # Comment
INSTRUCTION arguments INSTRUCTION arguments
The Instruction is not case-sensitive, however convention is for them to be The Instruction is not case-sensitive, however convention is for them to be
UPPERCASE in order to distinguish them from arguments more easily. UPPERCASE in order to distinguish them from arguments more easily.
Docker evaluates the instructions in a Dockerfile in order. **The first Docker evaluates the instructions in a Dockerfile in order. **The first
@ -106,7 +106,7 @@ The ``CMD`` instruction sets the command to be executed when running
the image. This is functionally equivalent to running ``docker commit the image. This is functionally equivalent to running ``docker commit
-run '{"Cmd": <command>}'`` outside the builder. -run '{"Cmd": <command>}'`` outside the builder.
.. note:: .. note::
Don't confuse `RUN` with `CMD`. `RUN` actually runs a Don't confuse `RUN` with `CMD`. `RUN` actually runs a
command and commits the result; `CMD` does not execute anything at command and commits the result; `CMD` does not execute anything at
build time, but specifies the intended command for the image. build time, but specifies the intended command for the image.
@ -131,7 +131,7 @@ value ``<value>``. This value will be passed to all future ``RUN``
instructions. This is functionally equivalent to prefixing the command instructions. This is functionally equivalent to prefixing the command
with ``<key>=<value>`` with ``<key>=<value>``
.. note:: .. note::
The environment variables will persist when a container is run The environment variables will persist when a container is run
from the resulting image. from the resulting image.
@ -158,10 +158,10 @@ The copy obeys the following rules:
(identity, gzip, bzip2 or xz), it is unpacked as a directory. (identity, gzip, bzip2 or xz), it is unpacked as a directory.
When a directory is copied or unpacked, it has the same behavior as When a directory is copied or unpacked, it has the same behavior as
``tar -x``: the result is the union of ``tar -x``: the result is the union of
1. whatever existed at the destination path and 1. whatever existed at the destination path and
2. the contents of the source tree, 2. the contents of the source tree,
with conflicts resolved in favor of 2) on a file-by-file basis. with conflicts resolved in favor of 2) on a file-by-file basis.
@ -203,14 +203,14 @@ container created from the image.
# Nginx # Nginx
# #
# VERSION 0.0.1 # VERSION 0.0.1
FROM ubuntu FROM ubuntu
MAINTAINER Guillaume J. Charmes "guillaume@dotcloud.com" MAINTAINER Guillaume J. Charmes "guillaume@dotcloud.com"
# make sure the package repository is up to date # make sure the package repository is up to date
RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
RUN apt-get update RUN apt-get update
RUN apt-get install -y inotify-tools nginx apache2 openssh-server RUN apt-get install -y inotify-tools nginx apache2 openssh-server
.. code-block:: bash .. code-block:: bash
@ -218,12 +218,12 @@ container created from the image.
# Firefox over VNC # Firefox over VNC
# #
# VERSION 0.3 # VERSION 0.3
FROM ubuntu FROM ubuntu
# make sure the package repository is up to date # make sure the package repository is up to date
RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
RUN apt-get update RUN apt-get update
# Install vnc, xvfb in order to create a 'fake' display and firefox # Install vnc, xvfb in order to create a 'fake' display and firefox
RUN apt-get install -y x11vnc xvfb firefox RUN apt-get install -y x11vnc xvfb firefox
RUN mkdir /.vnc RUN mkdir /.vnc
@ -231,7 +231,7 @@ container created from the image.
RUN x11vnc -storepasswd 1234 ~/.vnc/passwd RUN x11vnc -storepasswd 1234 ~/.vnc/passwd
# Autostart firefox (might not be the best way, but it does the trick) # Autostart firefox (might not be the best way, but it does the trick)
RUN bash -c 'echo "firefox" >> /.bashrc' RUN bash -c 'echo "firefox" >> /.bashrc'
EXPOSE 5900 EXPOSE 5900
CMD ["x11vnc", "-forever", "-usepw", "-create"] CMD ["x11vnc", "-forever", "-usepw", "-create"]