Merge pull request #4 from tianon/onbuild

Fix a few minor issues with ONBUILD variants
mono · Jan 15, 2015 · 2d7f8f3 · 2d7f8f3
2 parents 5856f94 + 66226b1
commit 2d7f8f3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/3.10.0/onbuild/Dockerfile b/3.10.0/onbuild/Dockerfile
@@ -2,11 +2,10 @@ FROM mono:3.10.0
 
 MAINTAINER Jo Shields <[email protected]>
 
-RUN mkdir -p /usr/src/app/{source,build}
+RUN mkdir -p /usr/src/app/source /usr/src/app/build
 WORKDIR /usr/src/app/source
 
-ONBUILD ADD . /usr/src/app/source
+ONBUILD COPY . /usr/src/app/source
 ONBUILD RUN nuget restore -NonInteractive
 ONBUILD RUN xbuild /property:Configuration=Release /property:OutDir=/usr/src/app/build/
-ONBUILD RUN rm -rf /usr/src/app/source
 ONBUILD WORKDIR /usr/src/app/build
diff --git a/3.12.0/onbuild/Dockerfile b/3.12.0/onbuild/Dockerfile
@@ -2,11 +2,10 @@ FROM mono:3.12.0
 
 MAINTAINER Jo Shields <[email protected]>
 
-RUN mkdir -p /usr/src/app/{source,build}
+RUN mkdir -p /usr/src/app/source /usr/src/app/build
 WORKDIR /usr/src/app/source
 
-ONBUILD ADD . /usr/src/app/source
+ONBUILD COPY . /usr/src/app/source
 ONBUILD RUN nuget restore -NonInteractive
 ONBUILD RUN xbuild /property:Configuration=Release /property:OutDir=/usr/src/app/build/
-ONBUILD RUN rm -rf /usr/src/app/source
 ONBUILD WORKDIR /usr/src/app/build
diff --git a/3.8.0/onbuild/Dockerfile b/3.8.0/onbuild/Dockerfile
@@ -2,11 +2,10 @@ FROM mono:3.8.0
 
 MAINTAINER Jo Shields <[email protected]>
 
-RUN mkdir -p /usr/src/app/{source,build}
+RUN mkdir -p /usr/src/app/source /usr/src/app/build
 WORKDIR /usr/src/app/source
 
-ONBUILD ADD . /usr/src/app/source
+ONBUILD COPY . /usr/src/app/source
 ONBUILD RUN nuget restore -NonInteractive
 ONBUILD RUN xbuild /property:Configuration=Release /property:OutDir=/usr/src/app/build/
-ONBUILD RUN rm -rf /usr/src/app/source
 ONBUILD WORKDIR /usr/src/app/build