4 files changed, 39 insertions, 38 deletions
diff --git a/Dockerfile b/Dockerfile
index e9cfe72..ad0f5e4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,38 +1,4 @@
-FROM ubuntu-debootstrap:14.04
-
-ENV omaha /srv/omaha
-
-RUN \
-  apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys ABF5BD827BD9BF62 && \
-  echo 'deb http://nginx.org/packages/ubuntu/ trusty nginx' | tee --append /etc/apt/sources.list && \
-  apt-get update && \
-  apt-get install -y --no-install-recommends python-pip python-dev python-lxml python-psycopg2 supervisor nginx libtiff5-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev python-pil build-essential libfuse-dev libcurl4-openssl-dev libxml2-dev mime-support automake libtool pkg-config libssl-dev wget tar && \
-  apt-get clean && \
-  apt-get autoremove -y && \
-  rm -rf /var/lib/{apt,dpkg,cache,log}/  && \
-  pip install uwsgi
-
-RUN \
-  wget https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.78.tar.gz -O /usr/src/v1.78.tar.gz && \
-  tar xvz -C /usr/src -f /usr/src/v1.78.tar.gz && \
-  cd /usr/src/s3fs-fuse-1.78 && \
-  ./autogen.sh && \
-  ./configure --prefix=/usr && \
-  make && \
-  make install && \
-  mkdir /srv/omaha_s3 && \
-  rm /usr/src/v1.78.tar.gz
-
-
-RUN mkdir -p $omaha/requirements
-WORKDIR ${omaha}
-
-ADD ./requirements/base.txt $omaha/requirements/base.txt
-
-RUN \
-  pip install paver && \
-  pip install --upgrade six && \
-  pip install -r requirements/base.txt
+FROM crystalnix/omaha-server-base:dev
 
 ADD . $omaha
 
diff --git a/Dockerfile-base b/Dockerfile-base
new file mode 100644
index 0000000..a5fe1f1
--- /dev/null
+++ b/Dockerfile-base
@@ -0,0 +1,35 @@
+FROM ubuntu-debootstrap:14.04
+
+ENV omaha /srv/omaha
+
+RUN \
+  apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys ABF5BD827BD9BF62 && \
+  echo 'deb http://nginx.org/packages/ubuntu/ trusty nginx' | tee --append /etc/apt/sources.list && \
+  apt-get update && \
+  apt-get install -y --no-install-recommends python-pip python-dev python-lxml python-psycopg2 supervisor nginx libtiff5-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev python-pil build-essential libfuse-dev libcurl4-openssl-dev libxml2-dev mime-support automake libtool pkg-config libssl-dev wget tar && \
+  apt-get clean && \
+  apt-get autoremove -y && \
+  rm -rf /var/lib/{apt,dpkg,cache,log}/  && \
+  pip install uwsgi
+
+RUN \
+  wget https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.78.tar.gz -O /usr/src/v1.78.tar.gz && \
+  tar xvz -C /usr/src -f /usr/src/v1.78.tar.gz && \
+  cd /usr/src/s3fs-fuse-1.78 && \
+  ./autogen.sh && \
+  ./configure --prefix=/usr && \
+  make && \
+  make install && \
+  mkdir /srv/omaha_s3 && \
+  rm /usr/src/v1.78.tar.gz
+
+
+RUN mkdir -p $omaha/requirements
+WORKDIR ${omaha}
+
+ADD ./requirements/base.txt $omaha/requirements/base.txt
+
+RUN \
+  pip install paver && \
+  pip install --upgrade six && \
+  pip install -r requirements/base.txt
diff --git a/docker-compose.test.yml b/docker-compose.tests.yml
index bfca91d..bfca91d 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.tests.yml
diff --git a/pavement.py b/pavement.py
index 769089f..87ae871 100644
--- a/pavement.py
+++ b/pavement.py
@@ -135,8 +135,8 @@ def docker_run_test():
 @task
 def run_test_in_docker():
     try:
-        sh('docker-compose -f docker-compose.test.yml -p omaha_testing run --rm sut paver docker_run_test')
+        sh('docker-compose -f docker-compose.tests.yml -p omaha_testing run --rm sut paver docker_run_test')
     except:
         pass
-    sh('docker-compose -f docker-compose.test.yml -p omaha_testing stop')
-    sh('docker-compose -f docker-compose.test.yml -p omaha_testing rm --force')
+    sh('docker-compose -f docker-compose.tests.yml -p omaha_testing stop')
+    sh('docker-compose -f docker-compose.tests.yml -p omaha_testing rm --force')