From e08add3ee816948b7ae230ce24f43df0a23fb30d Mon Sep 17 00:00:00 2001
From: Erwan Rouchet <rouchet@teklia.com>
Date: Fri, 19 Feb 2021 12:54:25 +0000
Subject: [PATCH] Base image bumps
---
.gitlab-ci.yml | 2 +-
Dockerfile | 4 ++--
Dockerfile.binary | 2 +-
base/requirements.txt | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2502abba81..674ed23fd6 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-3.1.6
+ image: registry.gitlab.com/arkindex/backend/base:django-3.1.7
cache:
paths:
diff --git a/Dockerfile b/Dockerfile
index 0364824492..6f0c06e349 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
-FROM registry.gitlab.com/arkindex/backend/base:django-3.1.6 as build
+FROM registry.gitlab.com/arkindex/backend/base:django-3.1.7 as build
RUN mkdir build
ADD . build
RUN cd build && python3 setup.py sdist
-FROM registry.gitlab.com/arkindex/backend/base:django-3.1.6
+FROM registry.gitlab.com/arkindex/backend/base:django-3.1.7
ARG COMMON_BRANCH=master
ARG COMMON_ID=9855787
ARG PONOS_BRANCH=master
diff --git a/Dockerfile.binary b/Dockerfile.binary
index b7ceb02fe8..f8cee8314c 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:django-3.1.6 as build
+FROM registry.gitlab.com/arkindex/backend/base:django-3.1.7 as build
# Import files from compilation
RUN mkdir /usr/share/arkindex
diff --git a/base/requirements.txt b/base/requirements.txt
index e82b8235a5..e594b86b4f 100644
--- a/base/requirements.txt
+++ b/base/requirements.txt
@@ -1,6 +1,6 @@
-boto3==1.15.16
-cryptography>=3.1
+boto3==1.17.11
+cryptography==3.4.6
Django==3.1.7
elasticsearch==6.8.1
-lxml==4.5.2
+lxml==4.6.2
psycopg2-binary==2.8.6
--
GitLab