From 24d7f0d0bc6d1a2cc63b89ef8a5f0cec5eb0f94d Mon Sep 17 00:00:00 2001
From: Bastien Abadie <bastien@nextcairn.com>
Date: Mon, 5 Oct 2020 15:48:54 +0200
Subject: [PATCH] Use new base image with Django 3.1.2
---
.gitlab-ci.yml | 2 +-
Dockerfile | 4 ++--
Dockerfile.binary | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dbc69ed013..8e1c41a4f6 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:postgis
+ image: registry.gitlab.com/arkindex/backend/base:django-3.1.2
cache:
paths:
diff --git a/Dockerfile b/Dockerfile
index 630986a0a4..eceeae5b4d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
-FROM registry.gitlab.com/arkindex/backend/base:postgis as build
+FROM registry.gitlab.com/arkindex/backend/base:django-3.1.2 as build
RUN mkdir build
ADD . build
RUN cd build && python3 setup.py sdist
-FROM registry.gitlab.com/arkindex/backend/base:postgis
+FROM registry.gitlab.com/arkindex/backend/base:django-3.1.2
ARG COMMON_BRANCH=master
ARG COMMON_ID=9855787
diff --git a/Dockerfile.binary b/Dockerfile.binary
index cfc71853eb..c30e984258 100644
--- a/Dockerfile.binary
+++ b/Dockerfile.binary
@@ -65,7 +65,7 @@ RUN python -m nuitka \
arkindex/manage.py
# Start over from a clean setup
-FROM registry.gitlab.com/arkindex/backend/base:postgis as build
+FROM registry.gitlab.com/arkindex/backend/base:django-3.1.2 as build
# Import files from compilation
RUN mkdir /usr/share/arkindex
--
GitLab