浏览代码

Merge pull request #1749 from msiebuhr/doc-from-tags

Document FROM <image>:<tag> Dockerfile instruction.
Andy Rothfusz 12 年之前
父节点
当前提交
df36f9db05
共有 1 个文件被更改,包括 7 次插入0 次删除
  1. 7 0
      docs/sources/use/builder.rst

+ 7 - 0
docs/sources/use/builder.rst

@@ -68,6 +68,10 @@ building images.
 
     ``FROM <image>``
 
+Or
+
+    ``FROM <image>:<tag>``
+
 The ``FROM`` instruction sets the :ref:`base_image_def` for subsequent
 instructions. As such, a valid Dockerfile must have ``FROM`` as its
 first instruction. The image can be any valid image -- it is
@@ -81,6 +85,9 @@ especially easy to start by **pulling an image** from the
 to create multiple images. Simply make a note of the last image id
 output by the commit before each new ``FROM`` command.
 
+If no ``tag`` is given to the ``FROM`` instruction, ``latest`` is
+assumed. If the used tag does not exist, an error will be returned.
+
 3.2 MAINTAINER
 --------------