Tweak gitlab pipeline

This commit is contained in:
Gabriel Augendre 2020-12-26 17:11:43 +01:00
parent 49998012d7
commit 3eb6a07ece
No known key found for this signature in database
GPG key ID: 1E693F4CE4AEE7B4
3 changed files with 3 additions and 6 deletions

View file

@ -67,7 +67,6 @@ publish:
<<: *build <<: *build
stage: publish stage: publish
variables: variables:
GIT_STRATEGY: none
POETRY_OPTIONS: "--no-dev" POETRY_OPTIONS: "--no-dev"
before_script: before_script:
- export IMAGE=$IMAGE_LATEST - export IMAGE=$IMAGE_LATEST

View file

@ -28,17 +28,14 @@ RUN git rev-parse HEAD | tee /version
## Beginning of runtime image ## Beginning of runtime image
FROM python:3.8.6-slim-buster as prod FROM python:3.8.6-slim-buster as prod
RUN apt-get update \ RUN echo "Europe/Paris" > /etc/timezone \
# Git is required for pre-commit checks
&& apt-get install -y --no-install-recommends git \
&& echo "Europe/Paris" > /etc/timezone \
&& mkdir /db && mkdir /db
COPY --from=venv /app/venv /app/venv/ COPY --from=venv /app/venv /app/venv/
ENV PATH /app/venv/bin:$PATH ENV PATH /app/venv/bin:$PATH
WORKDIR /app WORKDIR /app
COPY manage.py LICENSE .pre-commit-config.yaml pyproject.toml ./ COPY manage.py LICENSE pyproject.toml ./
COPY docker ./docker/ COPY docker ./docker/
COPY blog ./blog/ COPY blog ./blog/
COPY attachments ./attachments/ COPY attachments ./attachments/

View file

@ -5,6 +5,7 @@ target-version = ['py38']
profile = "black" profile = "black"
[tool.pytest.ini_options] [tool.pytest.ini_options]
addopts = "--color=yes"
minversion = "6.0" minversion = "6.0"
DJANGO_SETTINGS_MODULE = "blog.settings" DJANGO_SETTINGS_MODULE = "blog.settings"
testpaths = [ testpaths = [