Implement workaround problem with docker: moby/moby#2745

OpenObservatory · Feb 27, 2015 · 5122a9b · 5122a9b
1 parent f49af87
commit 5122a9b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/docker/ooni-app-builder/Dockerfile b/docker/ooni-app-builder/Dockerfile
@@ -9,16 +9,16 @@ RUN npm install -g grunt-cli
 RUN npm install -g bower
 
 # Install Mean.JS packages
-ADD ../../package.json /home/mean/package.json
+ADD package.json /home/mean/package.json
 RUN npm install
 
 # Manually trigger bower. Why doesnt this work via npm install?
-ADD ../../.bowerrc /home/mean/.bowerrc
-ADD ../../bower.json /home/mean/bower.json
+ADD .bowerrc /home/mean/.bowerrc
+ADD bower.json /home/mean/bower.json
 RUN bower install --config.interactive=false --allow-root
 
 # Make everything available for start
-ADD ../../ /home/mean
-ADD rebuild.sh /
+ADD . /home/mean
+ADD docker/ooni-app-builder/rebuild.sh /
 
 CMD ["/rebuild.sh"]
diff --git a/docker/ooni-app-builder/build.sh b/docker/ooni-app-builder/build.sh
@@ -1,2 +1,5 @@
 #!/bin/sh
+cd ../../
+cp docker/ooni-app-builder/Dockerfile .
 docker build -t ooni-app-rebuilder .
+rm Dockerfile
diff --git a/docker/ooni-app/Dockerfile b/docker/ooni-app/Dockerfile
@@ -9,16 +9,16 @@ RUN npm install -g grunt-cli
 RUN npm install -g bower
 
 # Install Mean.JS packages
-ADD ../../package.json /home/mean/package.json
+ADD package.json /home/mean/package.json
 RUN npm install
 
 # Manually trigger bower. Why doesnt this work via npm install?
-ADD ../../.bowerrc /home/mean/.bowerrc
-ADD ../../bower.json /home/mean/bower.json
+ADD .bowerrc /home/mean/.bowerrc
+ADD bower.json /home/mean/bower.json
 RUN bower install --config.interactive=false --allow-root
 
 # Make everything available for start
-ADD ../../ /home/mean
+ADD . /home/mean
 
 # currently only works for development
 ENV NODE_ENV development

diff --git a/docker/ooni-app/build.sh b/docker/ooni-app/build.sh
@@ -1,2 +1,5 @@
 #!/bin/sh
+cd ../../
+cp docker/ooni-app/Dockerfile .
 docker build -t ooni-app .
+rm Dockerfile