From 3eb6a07ece99dcb1a402bd7328481eb7d45aaa93 Mon Sep 17 00:00:00 2001
From: Gabriel Augendre <gabriel@augendre.info>
Date: Sat, 26 Dec 2020 17:11:43 +0100
Subject: [PATCH] Tweak gitlab pipeline

---
 .gitlab-ci.yml | 1 -
 Dockerfile     | 7 ++-----
 pyproject.toml | 1 +
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ec5263a..fe31a40 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,7 +67,6 @@ publish:
   <<: *build
   stage: publish
   variables:
-    GIT_STRATEGY: none
     POETRY_OPTIONS: "--no-dev"
   before_script:
     - export IMAGE=$IMAGE_LATEST
diff --git a/Dockerfile b/Dockerfile
index 91de9dc..c9c3cf6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,17 +28,14 @@ RUN git rev-parse HEAD | tee /version
 ## Beginning of runtime image
 FROM python:3.8.6-slim-buster as prod
 
-RUN apt-get update \
-    # Git is required for pre-commit checks
-    && apt-get install -y --no-install-recommends git \
-    && echo "Europe/Paris" > /etc/timezone \
+RUN echo "Europe/Paris" > /etc/timezone \
     && mkdir /db
 
 COPY --from=venv /app/venv /app/venv/
 ENV PATH /app/venv/bin:$PATH
 
 WORKDIR /app
-COPY manage.py LICENSE .pre-commit-config.yaml pyproject.toml ./
+COPY manage.py LICENSE pyproject.toml ./
 COPY docker ./docker/
 COPY blog ./blog/
 COPY attachments ./attachments/
diff --git a/pyproject.toml b/pyproject.toml
index 474e7d0..7087647 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,6 +5,7 @@ target-version = ['py38']
 profile = "black"
 
 [tool.pytest.ini_options]
+addopts = "--color=yes"
 minversion = "6.0"
 DJANGO_SETTINGS_MODULE = "blog.settings"
 testpaths = [