Merge branch 'master' of gitlab.ducoterra.net:ducoterra/ci_builder

.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:

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"]
+CMD ["gunicorn","-b",":8000", "-w", "4", "config.wsgi"]