[test] refactor of docker scripts

1 files changed, 20 insertions, 21 deletions

diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
index 36180633..915508ea 100644
--- a/scripts/docker/Dockerfile
+++ b/scripts/docker/Dockerfile
@@ -5,13 +5,18 @@ FROM debian
 EXPOSE 2424
 
 # install dependencies from debian repos
-COPY files/leap.list /etc/apt/sources.list.d/
+COPY files/apt/leap.list /etc/apt/sources.list.d/
 
 RUN apt-get update
 RUN apt-get -y --force-yes install leap-archive-keyring
 
 RUN apt-get update
+
 RUN apt-get -y install git
+RUN apt-get -y install vim
+RUN apt-get -y install python-ipdb
+
+# install python deps
 RUN apt-get -y install libpython2.7-dev
 RUN apt-get -y install libffi-dev
 RUN apt-get -y install libssl-dev
@@ -23,30 +28,24 @@ RUN apt-get -y install python-scrypt
 RUN apt-get -y install leap-keymanager
 RUN apt-get -y install python-tz
 
-# soledad-perf deps
+RUN pip install -U pip
+RUN pip install psutil
+
+# install soledad-perf deps
 RUN pip install klein
-RUN apt-get -y install gnuplot
 RUN apt-get -y install curl
 RUN apt-get -y install httperf
 
-# debugging deps
-RUN apt-get -y install vim
-RUN apt-get -y install python-ipdb
+# clone repositories
+ENV BASEURL "https://github.com/leapcode"
+ENV VARDIR "/var/local"
+ENV REPOS "soledad leap_pycommon soledad-perf"
+RUN for repo in ${REPOS}; do git clone ${BASEURL}/${repo}.git /var/local/${repo}; done
 
 # copy over files to help setup the environment and run soledad
 RUN mkdir -p /usr/local/soledad
-RUN mkdir -p /usr/local/soledad/conf
-
-# setup the enviroment for running soledad client and server
-COPY files/setup-env.sh /usr/local/soledad/
-RUN /usr/local/soledad/setup-env.sh
-
-# copy runtime files for running server, client, tests, etc on a container
-COPY files/client_side_db.py /usr/local/soledad/
-COPY files/start-client-test.sh /usr/local/soledad/
-COPY files/run-perf-test.sh /usr/local/soledad/
-COPY files/start-server.sh /usr/local/soledad/
-COPY files/start-trial-test.sh /usr/local/soledad/
-COPY files/test-env.py /usr/local/soledad/
-COPY files/util.py /usr/local/soledad/
-COPY files/conf/* /usr/local/soledad/conf/
+
+COPY files/build/install-deps-from-repos.sh /usr/local/soledad/
+RUN /usr/local/soledad/install-deps-from-repos.sh
+
+COPY files/bin/ /usr/local/soledad/