From a70aa8840fe27a20fb1da39cca734f2de9d317c3 Mon Sep 17 00:00:00 2001
From: Reese <ducoterra@gmail.com>
Date: Sat, 25 Apr 2020 02:32:06 +0000
Subject: [PATCH 1/2] Update Dockerfile

---
 Dockerfile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1ae1c82..a6271f3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,13 +6,12 @@ COPY api api
 COPY ui ui
 COPY manage.py manage.py
 COPY requirements.txt requirements.txt
+RUN pip install -r requirements.txt
 
 RUN useradd -ms /bin/bash django
 RUN chown -R django .
 
 USER django
-RUN python -m venv venv
-RUN venv/bin/pip install -r requirements.txt
-RUN venv/bin/python manage.py collectstatic
+RUN python manage.py collectstatic
 
-CMD ["venv/bin/gunicorn","-b",":8000", "-w", "4", "config.wsgi"]
\ No newline at end of file
+CMD ["gunicorn","-b",":8000", "-w", "4", "config.wsgi"]
\ No newline at end of file

From d2bf889e1f4b133d88a3a971bc73dfa7b8c23c2d Mon Sep 17 00:00:00 2001
From: Reese <ducoterra@gmail.com>
Date: Sat, 25 Apr 2020 02:32:29 +0000
Subject: [PATCH 2/2] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 646c09a..8403222 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,7 +28,7 @@ test:
     name: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
     entrypoint: [""]
   script:
-    - venv/bin/python manage.py test
+    - python manage.py test
 
 deploy:
   only: