create virtual environment even if container exists

jafreck · May 11, 2018 · 2db7b00 · 2db7b00
1 parent 4d4916e
commit 2db7b00
Showing 1 changed file with 20 additions and 22 deletions.
diff --git a/aztk/node_scripts/setup_host.sh b/aztk/node_scripts/setup_host.sh
@@ -71,32 +71,32 @@ if [ $? -ne 0 ]; then
   exit 3
 fi
 
+echo "Node python version:"
+python3 --version
+
+# set up aztk python environment
+export LC_ALL=C.UTF-8
+export LANG=C.UTF-8
+python3 -m pip install pipenv
+mkdir -p $AZTK_WORKING_DIR/.aztk-env
+cp $AZTK_WORKING_DIR/aztk/node_scripts/Pipfile $AZTK_WORKING_DIR/.aztk-env
+cp $AZTK_WORKING_DIR/aztk/node_scripts/Pipfile.lock $AZTK_WORKING_DIR/.aztk-env
+cd $AZTK_WORKING_DIR/.aztk-env
+export PIPENV_VENV_IN_PROJECT=true
+pipenv install --python /usr/bin/python3.5m
+pipenv run pip install --upgrade setuptools wheel #TODO: add pip when pipenv is compatible with pip10
+
+# Install python dependencies
+$AZTK_WORKING_DIR/.aztk-env/.venv/bin/pip install -r $(dirname $0)/requirements.txt
+export PYTHONPATH=$PYTHONPATH:$AZTK_WORKING_DIR
+
 # If the container already exists just restart. Otherwise create it
 if [ "$(docker ps -a -q -f name=$container_name)" ]; then
     echo "Docker container is already setup. Restarting it."
     docker restart $container_name
 else
     echo "Creating docker container."
-
-    echo "Node python version:"
-    python3 --version
-
-    # set up aztk python environment
-    export LC_ALL=C.UTF-8
-    export LANG=C.UTF-8
-    python3 -m pip install pipenv
-    mkdir -p $AZTK_WORKING_DIR/.aztk-env
-    cp $AZTK_WORKING_DIR/aztk/node_scripts/Pipfile $AZTK_WORKING_DIR/.aztk-env
-    cp $AZTK_WORKING_DIR/aztk/node_scripts/Pipfile.lock $AZTK_WORKING_DIR/.aztk-env
-    cd $AZTK_WORKING_DIR/.aztk-env
-    export PIPENV_VENV_IN_PROJECT=true
-    pipenv install --python /usr/bin/python3.5m
-    pipenv run pip install --upgrade setuptools wheel #TODO: add pip when pipenv is compatible with pip10
-
-    # Install python dependencies
-    $AZTK_WORKING_DIR/.aztk-env/.venv/bin/pip install -r $(dirname $0)/requirements.txt
-    export PYTHONPATH=$PYTHONPATH:$AZTK_WORKING_DIR
-
+
     echo "Running setup python script"
     $AZTK_WORKING_DIR/.aztk-env/.venv/bin/python $(dirname $0)/main.py setup-node $docker_repo_name
 
@@ -105,8 +105,6 @@ else
         sleep 0.1;
     done;
 
-
-
     # wait until container setup is complete
     echo "Waiting for spark docker container to setup."
     docker exec spark /bin/bash -c '$AZTK_WORKING_DIR/.aztk-env/.venv/bin/python $AZTK_WORKING_DIR/aztk/node_scripts/wait_until_setup_complete.py'