diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dd276b6..947372b 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: 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