From 8d07bbc7afff65c24f8535ee803a70cda0bd1ca1 Mon Sep 17 00:00:00 2001
From: Evan Cordell <cordell.evan@gmail.com>
Date: Tue, 11 Jul 2017 10:34:46 -0400
Subject: [PATCH] Remove volumes

---
 Dockerfile                     | 37 ++++++++++++++++------------------
 conf/init/copy_config_files.sh |  1 -
 quay-base.dockerfile           |  2 +-
 3 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 31957f0e5..be7fba93a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,11 +4,7 @@ FROM quay.io/quay/quay-base:latest
 
 WORKDIR $QUAYDIR
 
-# Install python dependencies
-RUN virtualenv --distribute venv \
-     && venv/bin/pip install -r requirements.txt \
-     && venv/bin/pip install -r requirements-tests.txt \
-     && venv/bin/pip freeze
+COPY requirements.txt requirements-tests.txt ./
 
 # Check python dependencies for the GPL
 # Due to the following bug, pip results must be piped to a file before grepping:
@@ -17,23 +13,22 @@ RUN cat requirements.txt | grep -v "^-e" | awk -F'==' '{print $1}' | xargs venv/
     test -z $(cat pipinfo.txt | grep GPL | grep -v LGPL) && \
     rm pipinfo.txt
 
+RUN virtualenv --distribute venv \
+    && venv/bin/pip install -r requirements.txt \
+    && venv/bin/pip install -r requirements-tests.txt \
+    && venv/bin/pip freeze
+
 # Install front-end dependencies
-ADD package.json package.json
-ADD tsconfig.json tsconfig.json
-ADD webpack.config.js webpack.config.js
-ADD yarn.lock yarn.lock
-RUN yarn install --ignore-engines
+# JS depedencies
+COPY yarn.lock ./
+RUN yarn install --ignore-engines  
 
-# Add static files
-ADD static static
-
-# Run Webpack
-RUN yarn build
-
-# Optimize our images
-ADD static/img static/img
-RUN jpegoptim static/img/**/*.jpg
-RUN optipng -clobber -quiet static/img/**/*.png
+# JS compile
+COPY static static
+COPY package.json tsconfig.json webpack.config.js tslint.json  ./
+RUN yarn build \
+  && jpegoptim static/img/**/*.jpg \
+  && optipng -clobber -quiet static/img/**/*.png
 
 COPY . .
 
@@ -49,6 +44,8 @@ RUN mkdir -p /etc/my_init.d /etc/systlog-ng /usr/local/bin /etc/monit static/fon
     && cp .git/HEAD GIT_HEAD \
     && rm -rf /etc/service/syslog-forwarder
 
+RUN ln -s $QUAYCONF /conf
+
 # Cleanup any NPM-related stuff.
 # RUN apt-get remove -y --auto-remove python-dev g++ libjpeg62-dev libevent-dev libldap2-dev libsasl2-dev libpq-dev libffi-dev libgpgme11-dev nodejs jpegoptim optipng w3m \
 #     && apt-get autoremove -y \
diff --git a/conf/init/copy_config_files.sh b/conf/init/copy_config_files.sh
index 50846e80d..0aef306ef 100755
--- a/conf/init/copy_config_files.sh
+++ b/conf/init/copy_config_files.sh
@@ -4,7 +4,6 @@ QUAYCONF=${QUAYCONF:-"$QUAYPATH/conf"}
 
 cd ${QUAYDIR:-"/"}
 
-ln -s /conf/stack/* -t $QUAYCONF/stack
 
 if [ -e $QUAYCONF/stack/robots.txt ]
 then
diff --git a/quay-base.dockerfile b/quay-base.dockerfile
index c2332353f..996469cde 100644
--- a/quay-base.dockerfile
+++ b/quay-base.dockerfile
@@ -98,6 +98,6 @@ COPY external_libraries.py _init.py ./
 RUN venv/bin/python -m external_libraries
 
 RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /root/.cache
-VOLUME ["$QUAYCONF/stack", "/conf/stack", "/conf/etcd", "/var/log", "/datastorage", "/tmp", "$QUAYCONF/etcd"]
+VOLUME ["/var/log", "/datastorage", "/tmp"]
 
 EXPOSE 443 8443 80