improving setup.sh

gaia-adm · Aug 18, 2015 · f5370ef · f5370ef
1 parent fd91724
commit f5370ef
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/distribution/release/nodejs/Dockerfile b/distribution/release/nodejs/Dockerfile
@@ -7,7 +7,7 @@ COPY . /src
 # to docker build command to allow setting up proxy
 ADD setup.sh /tmp/setup.sh
 RUN chmod +x /tmp/setup.sh
-RUN /tmp/setup.sh
+RUN /tmp/setup.sh /src
 
 # Set the working directory
 WORKDIR   /src

diff --git a/distribution/release/python/Dockerfile b/distribution/release/python/Dockerfile
@@ -7,7 +7,7 @@ COPY . /src
 # to docker build command to allow setting up proxy
 ADD setup.sh /tmp/setup.sh
 RUN chmod +x /tmp/setup.sh
-RUN /tmp/setup.sh
+RUN /tmp/setup.sh /src
 
 # Set the working directory
 WORKDIR   /src

diff --git a/setup.sh b/setup.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+if [ -n "$1" ];then
+    cd $1
+fi
+
 function test_connection()
 {
     curl --connect-timeout 5 -s -X OPTIONS http://www.google.com >> /dev/null
@@ -39,7 +43,6 @@ function setup_container()
 {
     echo "Setting up container.."
 
-    cd /src
     npm install
 }