From 39ef665e354a39000bceddb89a080adeb21930dc Mon Sep 17 00:00:00 2001
From: Erwan Rouchet <rouchet@teklia.com>
Date: Tue, 1 Feb 2022 10:07:13 +0100
Subject: [PATCH] Bump to Django 4.0.2
---
.gitlab-ci.yml | 2 +-
Dockerfile | 4 ++--
Dockerfile.binary | 2 +-
base/requirements.txt | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6b33e2e97a..99827c7c00 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ include:
# For jobs that run backend scripts directly
.backend-setup:
- image: registry.gitlab.com/arkindex/backend/base:django-4
+ image: registry.gitlab.com/arkindex/backend/base:django-4.0.2
cache:
paths:
diff --git a/Dockerfile b/Dockerfile
index 89a9270e7b..88527d0a5a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
-FROM registry.gitlab.com/arkindex/backend/base:django-4 as build
+FROM registry.gitlab.com/arkindex/backend/base:django-4.0.2 as build
RUN mkdir build
ADD . build
RUN cd build && python3 setup.py sdist
-FROM registry.gitlab.com/arkindex/backend/base:django-4
+FROM registry.gitlab.com/arkindex/backend/base:django-4.0.2
ARG PONOS_BRANCH=master
ARG PONOS_ID=10017043
ARG TRANSKRIBUS_BRANCH=master
diff --git a/Dockerfile.binary b/Dockerfile.binary
index 09cdaecba8..d7d8682a34 100644
--- a/Dockerfile.binary
+++ b/Dockerfile.binary
@@ -61,7 +61,7 @@ RUN python -m nuitka \
arkindex/manage.py
# Start over from a clean setup
-FROM registry.gitlab.com/arkindex/backend/base:django-4 as build
+FROM registry.gitlab.com/arkindex/backend/base:django-4.0.2 as build
# Import files from compilation
RUN mkdir /usr/share/arkindex
diff --git a/base/requirements.txt b/base/requirements.txt
index d7840c611f..ef856c6efc 100644
--- a/base/requirements.txt
+++ b/base/requirements.txt
@@ -1,5 +1,5 @@
boto3==1.18.13
cryptography==3.4.7
-Django==4.0.1
+Django==4.0.2
lxml==4.6.3
psycopg2-binary==2.9.1
--
GitLab