1 files changed, 7 insertions, 41 deletions
diff --git a/Dockerfile b/Dockerfile
index e9cfe72..47c3c03 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,49 +1,15 @@
-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:alpine
 
 ADD . $omaha
 
 # setup all the configfiles
 RUN \
-  mkdir /etc/nginx/sites-enabled/ && \
-  rm /etc/nginx/conf.d/default.conf && \
-  rm /etc/nginx/nginx.conf && \
-  ln -s /srv/omaha/conf/nginx.conf /etc/nginx/ && \
-  ln -s /srv/omaha/conf/nginx-app.conf /etc/nginx/sites-enabled/ && \
-  ln -s /srv/omaha/conf/supervisord.conf /etc/supervisor/conf.d/
+    mkdir /etc/nginx/sites-enabled/ && \
+    mkdir /var/log/supervisor/ && \
+    rm /etc/nginx/nginx.conf && \
+    ln -s /srv/omaha/conf/nginx.conf /etc/nginx/ && \
+    ln -s /srv/omaha/conf/nginx-app.conf /etc/nginx/sites-enabled/ && \
+    ln -sfn /srv/omaha/conf/supervisord.conf /etc/
 
 EXPOSE 80
 CMD ["paver", "docker_run"]