From df059fb00dd999e1e3615bfbdc3a836ac52a1e04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= <timothee.floure@posteo.net>
Date: Fri, 8 May 2020 12:15:40 +0200
Subject: [PATCH] Speed-up CI with pre-built image, add resources directory

---
 .gitlab-ci.yml                           | 4 +---
 resources/ci/.lock                       | 0
 resources/ci/Dockerfile                  | 3 +++
 vat-rates.csv => resources/vat-rates.csv | 0
 4 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 resources/ci/.lock
 create mode 100644 resources/ci/Dockerfile
 rename vat-rates.csv => resources/vat-rates.csv (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 33c1c06..e468591 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ stages:
 
 run-tests:
   stage: test
-  image: fedora:latest
+  image: code.ungleich.ch:5050/uncloud/uncloud/uncloud-ci:latest
   services:
     - postgres:latest
   variables:
@@ -12,8 +12,6 @@ run-tests:
     DATABASE_USER: postgres
     POSTGRES_HOST_AUTH_METHOD: trust
   coverage: /^TOTAL.+?(\d+\%)$/
-  before_script:
-    - dnf install -y python3-devel python3-pip python3-coverage libpq-devel openldap-devel gcc chromium
   script:
     - pip install -r requirements.txt
     - coverage run --source='.' ./manage.py test
diff --git a/resources/ci/.lock b/resources/ci/.lock
new file mode 100644
index 0000000..e69de29
diff --git a/resources/ci/Dockerfile b/resources/ci/Dockerfile
new file mode 100644
index 0000000..020b66e
--- /dev/null
+++ b/resources/ci/Dockerfile
@@ -0,0 +1,3 @@
+FROM fedora:latest
+
+RUN dnf install -y python3-devel python3-pip python3-coverage libpq-devel openldap-devel gcc chromium
diff --git a/vat-rates.csv b/resources/vat-rates.csv
similarity index 100%
rename from vat-rates.csv
rename to resources/vat-rates.csv