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

This commit is contained in:
ducoterra
2020-04-25 11:15:57 -04:00
2 changed files with 4 additions and 5 deletions

View File

@@ -28,7 +28,7 @@ test:
name: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG name: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
entrypoint: [""] entrypoint: [""]
script: script:
- venv/bin/python manage.py test - python manage.py test
deploy: deploy:
only: only:

View File

@@ -6,13 +6,12 @@ COPY api api
COPY ui ui COPY ui ui
COPY manage.py manage.py COPY manage.py manage.py
COPY requirements.txt requirements.txt COPY requirements.txt requirements.txt
RUN pip install -r requirements.txt
RUN useradd -ms /bin/bash django RUN useradd -ms /bin/bash django
RUN chown -R django . RUN chown -R django .
USER django USER django
RUN python -m venv venv RUN python manage.py collectstatic
RUN venv/bin/pip install -r requirements.txt
RUN venv/bin/python manage.py collectstatic
CMD ["venv/bin/gunicorn","-b",":8000", "-w", "4", "config.wsgi"] CMD ["gunicorn","-b",":8000", "-w", "4", "config.wsgi"]