From 1b58965e8c9532979c02e9a3ac0555bfabea612c Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sat, 16 Dec 2017 15:19:08 +0100
Subject: [PATCH] Better cache in dockerfile
---
.gitlab-ci.yml | 2 ++
api/Dockerfile | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b68d19c..ea1fbf67 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,6 +15,8 @@ test_api:
image: funkwhale/funkwhale:base
before_script:
- cd api
+ - pip install -r requirements/base.txt
+ - pip install -r requirements/local.txt
- pip install -r requirements/test.txt
script:
- pytest
diff --git a/api/Dockerfile b/api/Dockerfile
index bb1942c2..def9a431 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -8,7 +8,9 @@ COPY ./requirements.apt /requirements.apt
RUN apt-get update -qq && grep "^[^#;]" requirements.apt | xargs apt-get install -y
-COPY ./requirements /requirements
+COPY ./requirements/base.txt /requirements
+RUN pip install -r /requirements/base.txt
+COPY ./requirements/production.txt /requirements
RUN pip install -r /requirements/production.txt
COPY . /app
--
GitLab