Merge pull request #20 from tulku/cleaner-do-docker

Cleaner do docker
ekumenlabs · Feb 6, 2015 · 50d26b5 · 50d26b5
2 parents 911ac35 + b87f563
commit 50d26b5
Showing 1 changed file with 75 additions and 18 deletions.
diff --git a/do_docker.sh b/do_docker.sh
@@ -3,43 +3,100 @@
 my_loc="$(cd "$(dirname $0)" && pwd)"
 source $my_loc/utils.sh
 
+del_image=0
+del_tmp=0
+portable=0
+standard=0
+
 if [[ $# -lt 1 ]] ; then
+    standard=1
     output_path=$my_loc"/output"
-else
-    output_path=$1
 fi
 
-# Requires docker 1.3+
-cmd_exists docker || die 'docker was not found'
+for var in "$@"
+do
+    if [[ ${var} == "--help" ]] ||  [[ ${var} == "-h" ]] ; then
+        help=1
+    fi
+    if [[ ${var} == "--delete-image" ]] ; then
+        del_image=1
+    fi
 
-IMAGE=$(sudo docker images | grep "rosndk " |  awk '{print $3}')
-if [[ -z $IMAGE ]]; then
-    echo -e '\e[34mCreting docker image.\e[39m'
-    sudo docker build -t rosndk .
-    # TODO: Verify successful docker image build
+    if [[ ${var} == "--delete-tmp" ]] ; then
+        del_tmp=1
+    fi
+
+    if [[ ${var} == "--portable" ]] ; then
+        output_path=$my_loc"/output"
+        portable=1
+    fi
+
+    if [[ ${var} == "--raw" ]] ; then
+        standard=1
+        output_path=$my_loc"/output"
+        if [[ $# -eq 2 ]]; then
+          output_path=$2
+        fi
+    fi
+done
+
+if [[ $help -eq 1 ]] ; then
+    echo "Usage: $0 [-h | --help] [--delete-image] [--delete-tmp] [--portable] [--standard] [output_dir]"
+    echo "  example: $0 --raw /path/to/output/dir, will create a raw output in the desired path (only useful from Docker)"
+    echo "  example: $0 --portable, will create a portable tar.gz output in the current directory."
+    echo "  example: $0 --delete-image, will delete the Docker image created for the build."
+    echo "  example: $0 --delete-tmp, will delete the Docker temp files created during build and rebuilds."
+    echo "  Only one action can be executed per invocation."
+    exit 1
 fi
 
-if [ "x${1}" == "x--delete-image" ]
-then
+if [[ $del_image -eq 1 ]]; then
   echo
   echo -e '\e[34mDeleting docker image.\e[39m'
   echo
   sudo docker rmi -f rosndk
+  exit $?
+fi
 
-elif [ "x${1}" == "x--delete-tmp" ]
-then
+if [[ $del_tmp -eq 1 ]]; then
   echo
   echo -e '\e[34mDeleting docker temporary directory.\e[39m'
   echo
   sudo rm -rf /var/lib/docker/tmp
+  exit $?
+fi
 
-else
-  echo
-  echo -e '\e[34mRunning megabuild.\e[39m'
-  echo
+echo
+echo -e '\e[34mRunning build. This will take a LONG time.\e[39m'
+echo
+
+# Requires docker 1.3+
+cmd_exists docker || die 'docker was not found'
+
+IMAGE=$(sudo docker images | grep "rosndk " |  awk '{print $3}')
+if [[ -z $IMAGE ]]; then
+    echo -e '\e[34mCreting docker image.\e[39m'
+    sudo docker build -t rosndk .
+    # TODO: Verify successful docker image build
+fi
+
+
+if [[ $standard -eq 1 ]]; then
   echo -e '\e[34mSetting output_path to: '$output_path'.\e[39m'
   echo
-
   sudo docker run -t -v $my_loc:/opt/roscpp_android -v $output_path:/opt/roscpp_output -i rosndk /opt/roscpp_android/do_everything.sh /opt/roscpp_output
+  exit $?
+fi
 
+if [[ $portable -eq 1 ]]; then
+  echo -e '\e[34mBuilding in portable mode.\e[39m'
+  echo
+  sudo docker run -t -v $my_loc:/opt/roscpp_android -v $output_path:/opt/roscpp_output -i rosndk /opt/roscpp_android/do_everything.sh /opt/roscpp_output --portable
+  echo
+  echo -e '\e[34mCreating output/roscpp_android_ndk.tar.gz.\e[39m'
+  echo
+  cd output
+  sudo tar czf roscpp_android_ndk.tar.gz roscpp_android_ndk
+  sudo chown $UID roscpp_android_ndk.tar.gz
+  exit $?
 fi