From 9329717335abdff9f6966957579ab5d8051612fc Mon Sep 17 00:00:00 2001
From: Shyam Sunder <sgsunder1@gmail.com>
Date: Sat, 27 Jul 2019 14:34:58 -0400
Subject: [PATCH] server/docker: Rewrite how files are copied in Docker

This is in preperation of a future commit that will perform
the unit tests in a docker container
---
 server/.dockerignore | 13 ++++++-------
 server/Dockerfile    | 15 +++++++++------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/server/.dockerignore b/server/.dockerignore
index a20ffa91..539365f8 100644
--- a/server/.dockerignore
+++ b/server/.dockerignore
@@ -1,8 +1,7 @@
-szurubooru/tests/*
-setup.cfg
-.pylintrc
-mypi.ini
-
-Dockerfile
-.dockerignore
 **/.gitignore
+.dockerignore
+.pylintrc
+Dockerfile
+config.yaml
+mypy.ini
+setup.cfg
diff --git a/server/Dockerfile b/server/Dockerfile
index dd5bd5ad..0b0664d2 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,9 +1,12 @@
-FROM scratch as approot
-WORKDIR /opt/app
+FROM busybox as approot
 
-COPY alembic.ini wait-for-es generate-thumb ./
-COPY szurubooru/ ./szurubooru/
-COPY config.yaml.dist ./
+COPY . /opt/app/
+RUN \
+    # Remove unit tests from production release
+    rm -rf /opt/app/szurubooru/tests && \
+    # Remove requirements files, will be added later
+    rm -f /opt/app/requirements.txt && \
+    rm -f /opt/app/dev-requirements.txt
 
 
 FROM python:3.6-slim
@@ -38,7 +41,7 @@ COPY --chown=app:app requirements.txt ./requirements.txt
 RUN pip3 install --no-cache-dir -r ./requirements.txt
 
 # done to minimize number of layers in final image
-COPY --chown=app:app --from=approot / /
+COPY --chown=app:app --from=approot /opt/app /opt/app/
 
 VOLUME ["/data/"]
 EXPOSE ${PORT}