switch the default back to python2, minimal dockerfile

docker/Dockerfile

@@ -1,18 +1,24 @@
 FROM ubuntu:16.04
 
-# prepare packages in env
-RUN apt-get update && apt-get -y install build-essential debootstrap debian-archive-keyring libjpeg-dev zlib1g-dev unzip wget graphviz curl python-dev python-pip python-virtualenv git wget flex bison libtool automake autoconf autotools-dev pkg-config libglib2.0-dev
+# minimal system basics
+RUN apt-get update
+RUN apt-get -y install git curl
 
 # fetch qira
 RUN git clone https://github.com/geohot/qira.git
 WORKDIR /qira
 
 # build qemu
+RUN apt-get -y install python build-essential pkg-config zlib1g-dev libglib2.0-dev libpixman-1-dev
 RUN cd tracers && ./qemu_build.sh
 
 # install python packages and link qira
+RUN apt-get -y install python python-virtualenv python-dev
 RUN virtualenv venv
 RUN bash -c 'source venv/bin/activate && pip install --upgrade pip'
 RUN bash -c 'source venv/bin/activate && pip install --upgrade -r requirements.txt'
 RUN ln -sf /qira/qira /usr/local/bin/qira
 
+# test will build Cython qiradb
+RUN ./run_tests.sh
+

install.sh

@@ -21,14 +21,6 @@ if [[ "$unamestr" == 'Linux' ]]; then
     sudo zypper install -y python-pip python-devel gcc gcc-c++ python-virtualenv glib2-devel
   fi
 
-  if [ $(tracers/qemu/qira-i386 > /dev/null; echo $?) == 1 ]; then
-    echo "QIRA QEMU appears to run okay"
-  else
-    echo "building QEMU"
-    cd tracers
-    ./qemu_build.sh
-    cd ../
-  fi
 elif [[ "$unamestr" == 'Darwin' ]]; then
   if [ $(which brew) ]; then
     echo "Installing OS X dependencies"
@@ -43,12 +35,21 @@ elif [[ "$unamestr" == 'Darwin' ]]; then
   fi
 fi
 
+if [ $(tracers/qemu/qira-i386 > /dev/null; echo $?) == 1 ]; then
+  echo "QIRA QEMU appears to run okay"
+else
+  echo "building QEMU"
+  cd tracers
+  ./qemu_build.sh
+  cd ../
+fi
+
 echo "installing pip packages"
 
-virtualenv venv --python=python3
+virtualenv venv
 source venv/bin/activate
-pip3 install --upgrade pip
-pip3 install --upgrade -r requirements.txt
+pip install --upgrade pip
+pip install --upgrade -r requirements.txt
 
 echo "making symlink"
 sudo ln -sf $(pwd)/qira /usr/local/bin/qira

qira

@@ -15,4 +15,4 @@ fi
 
 unset PYTHONPATH
 source $DIR/venv/bin/activate
-exec /usr/bin/env python3 $DIR/middleware/qira.py $*
+exec /usr/bin/env python $DIR/middleware/qira.py $*