浏览代码

Merge pull request #2461 from SvenDowideit/move-to-docs-base-latest

Use FROM docs/base:latest again
moxiegirl 10 年之前
父节点
当前提交
0eba234c54
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      docs/Dockerfile

+ 3 - 2
docs/Dockerfile

@@ -1,4 +1,4 @@
-FROM docs/base:hugo-github-linking
+FROM docs/base:latest
 MAINTAINER Mary Anthony <[email protected]> (@moxiegirl)
 MAINTAINER Mary Anthony <[email protected]> (@moxiegirl)
 
 
 RUN svn checkout https://github.com/docker/docker/trunk/docs /docs/content/engine
 RUN svn checkout https://github.com/docker/docker/trunk/docs /docs/content/engine
@@ -9,7 +9,8 @@ RUN svn checkout https://github.com/kitematic/kitematic/trunk/docs /docs/content
 RUN svn checkout https://github.com/docker/tutorials/trunk/docs /docs/content/tutorials
 RUN svn checkout https://github.com/docker/tutorials/trunk/docs /docs/content/tutorials
 RUN svn checkout https://github.com/docker/opensource/trunk/docs /docs/content
 RUN svn checkout https://github.com/docker/opensource/trunk/docs /docs/content
 
 
+ENV PROJECT=compose
 # To get the git info for this repo
 # To get the git info for this repo
 COPY . /src
 COPY . /src
 
 
-COPY . /docs/content/compose/
+COPY . /docs/content/$PROJECT/