From e13403b449e680ca72a8b5ed24b30345c90e855e Mon Sep 17 00:00:00 2001
From: Erwan Rouchet <rouchet@teklia.com>
Date: Wed, 18 Dec 2019 10:43:24 +0100
Subject: [PATCH] Bump Django 2.2.9

---
 .gitlab-ci.yml        | 2 +-
 Dockerfile            | 2 +-
 Makefile              | 1 +
 base/requirements.txt | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b4fa1e7e0..1709b117a6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.com/arkindex/backend:base-0.10.3
+image: registry.gitlab.com/arkindex/backend:base-0.10.4
 stages:
   - test
   - build
diff --git a/Dockerfile b/Dockerfile
index ce22f49792..04afc9c287 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.gitlab.com/arkindex/backend:base-0.10.3
+FROM registry.gitlab.com/arkindex/backend:base-0.10.4
 
 ARG COMMON_BRANCH=master
 ARG COMMON_ID=9855787
diff --git a/Makefile b/Makefile
index 13fb26c932..bc51d29cd7 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ base: require-version
 	docker build $(ROOT_DIR)/base -t registry.gitlab.com/arkindex/backend:base-$(version)
 	docker push registry.gitlab.com/arkindex/backend:base-$(version)
 	sed -i '/image:/s/base-.*$$/base-$(version)/' $(ROOT_DIR)/.gitlab-ci.yml
+	sed -i '/FROM/s/base-.*$$/base-$(version)/' $(ROOT_DIR)/Dockerfile
 
 clean:
 	rm -rf *.egg-info build dist .eggs
diff --git a/base/requirements.txt b/base/requirements.txt
index bfe8c61574..080fcd2b78 100644
--- a/base/requirements.txt
+++ b/base/requirements.txt
@@ -1,6 +1,6 @@
 boto3==1.9
 cryptography>=2.8
-Django==2.2
+Django==2.2.9
 elasticsearch==6.2.0
 hiredis==1.0.0
 ijson==2.3
-- 
GitLab