Fix docker setup.

docker/vispa-base/Dockerfile

-FROM debian:jessie
+FROM debian:stretch
 
 # image config
 LABEL name="vispa-base"
 LABEL version="0.1"
 
 # basic environment variables
-ENV PATH=/usr/local/bin:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV LD_LIBRARY_PATH=/usr/local/lib
-ENV LIBPATH=/usr/local/lib
-ENV PYTHONPATH=/usr/local/lib:/usr/local/lib64/python2.7/site-packages
-ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
-ENV CMAKE_MODULE_PATH=/usr/local/etc/cmake
-ENV MANPATH=/usr/local/man
+ENV PATH /usr/local/bin:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin:$PATH
+ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
+ENV LIBPATH /usr/local/lib:$LIBPATH
+ENV PYTHONPATH /usr/local/lib:/usr/local/lib64/python2.7/site-packages:$PYTHONPATH
+ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:$PKG_CONFIG_PATH
+ENV CMAKE_MODULE_PATH /usr/local/etc/cmake:$CMAKE_MODULE_PATH
+ENV MANPATH /usr/local/man:$MANPATH
 
 # setup software
 RUN apt-get -y update; apt-get clean
-RUN apt-get -y install build-essential zip gzip zlib1g-dev libffi-dev libssl-dev libsqlite3-dev openssh-server nano wget htop git mercurial; apt-get clean
-# RUN DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server; apt-get clean
-
-RUN wget https://www.python.org/ftp/python/2.7.13/Python-2.7.13.tgz && \
-    tar -xzf Python-2.7.13.tgz && \
-    rm Python-2.7.13.tgz && \
-    cd Python-2.7.13 && \
-    ./configure --enable-shared && \
-    make && \
-    make install && \
-    cd .. && \
-    rm -rf Python-2.7.13
-RUN wget https://bootstrap.pypa.io/get-pip.py; python get-pip.py; rm get-pip.py
+RUN apt-get -y install build-essential zip gzip zlib1g-dev libffi-dev libssl-dev libsqlite3-dev \
+    openssh-server nano wget htop git mercurial python-dev python-setuptools; apt-get clean
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server; apt-get clean
+RUN easy_install pip
 RUN pip install cherrypy
 RUN pip install mako
 RUN pip install sqlalchemy
-# RUN pip install rpyc
 RUN pip install -e git+https://github.com/geromueller/rpyc.git@12a53169100bce7175470f959e956f29902fa153#egg=rpyc-dev
 RUN pip install alembic
 RUN pip install paramiko

docker/vispa-root/Dockerfile

+FROM 3pia/vispa-base
+
+# image config
+LABEL name="vispa"
+LABEL version="0.1"
+EXPOSE 4282
+EXPOSE 22
+
+# setup vispa
+RUN hg clone https://forge.physik.rwth-aachen.de/hg/vispa-web/vispa /home/vispa
+RUN cp /home/vispa/conf/cherrypy.ini.sample /home/vispa/conf/cherrypy.ini
+
+# default command
+WORKDIR /home/vispa
+CMD /usr/sbin/sshd && \
+    ./bin/vispad -c conf -d var -l debug --no-daemon

docker/vispa/Dockerfile

@@ -6,8 +6,8 @@ EXPOSE 22
 LABEL name="vispa"
 LABEL version="0.1"
 
-# create a user
-RUN echo 'vispa\nvispa' | adduser vispa --gecos ""
+# create the vispa user
+RUN echo "vispa\nvispa" | adduser vispa --gecos ""
 
 # download vispa and tweak the config
 USER vispa