From d9cd3bc84e2eccef12e8e4a0a7e7d8bb51cf0ccf Mon Sep 17 00:00:00 2001
From: Erwan Rouchet <rouchet@teklia.com>
Date: Tue, 16 Jul 2019 09:40:15 +0000
Subject: [PATCH] Add cryptography to the base image
---
.gitlab-ci.yml | 4 ++--
Dockerfile | 2 +-
base/Dockerfile | 2 +-
base/requirements.txt | 1 +
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d510c943b5..aab1140bc0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.com/arkindex/backend:base-0.9.4
+image: registry.gitlab.com/arkindex/backend:base-0.9.6
stages:
- test
- build
@@ -8,7 +8,7 @@ cache:
- .cache/pip
before_script:
- - apk --update add build-base libffi-dev openssl-dev
+ - apk --update add build-base
# Custom line to install our own deps from Git using GitLab CI credentials
- "pip install -e git+https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/arkindex/common#egg=arkindex-common"
- "pip install -e git+https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/arkindex/ponos#egg=ponos-server"
diff --git a/Dockerfile b/Dockerfile
index f3bdcc7127..f9b6c9936a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.gitlab.com/arkindex/backend:base-0.9.4
+FROM registry.gitlab.com/arkindex/backend:base-0.9.6
ARG COMMON_BRANCH=master
ARG COMMON_ID=9855787
diff --git a/base/Dockerfile b/base/Dockerfile
index ef1d48c8f3..2469ff365a 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -3,7 +3,7 @@ FROM python:3.6-alpine as base
FROM base as staging
# Add system dependencies, use cache by copying requirements
-RUN apk add --update --no-cache postgresql-dev jpeg-dev build-base gzip zlib-dev libmagic libxml2-dev libxslt-dev
+RUN apk add --update --no-cache postgresql-dev jpeg-dev build-base gzip zlib-dev libmagic libxml2-dev libxslt-dev libffi-dev
# Install long buildtime deps
# Uses a source archive instead of full local copy to speedup docker build
diff --git a/base/requirements.txt b/base/requirements.txt
index 25992b65e9..10f309948a 100644
--- a/base/requirements.txt
+++ b/base/requirements.txt
@@ -1,3 +1,4 @@
+cryptography>=2.7
Django==2.2
elasticsearch==6.2.0
ijson==2.3
--
GitLab