From b5e5ff9bf82566e162bd7a6e0ac2309684cd2bfb Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Mon, 5 Apr 2021 15:03:29 +0200 Subject: [PATCH 1/5] testing docker build --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5e22b46bb1..69cab974ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM python:3.8-alpine #Install all dependencies. -RUN apk add --no-cache postgresql-libs gettext zlib libjpeg libxml2-dev libxslt-dev +RUN apk add --no-cache postgresql-libs gettext zlib libjpeg libxml2-dev libxslt-dev py-cryptography #Print all logs without buffering it. ENV PYTHONUNBUFFERED 1 From 7aff5dc44adf41e6260be04f7349a2389b677e44 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Mon, 5 Apr 2021 15:24:00 +0200 Subject: [PATCH 2/5] set cryptography manually --- requirements.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 4f05cee7ec..f53c6cec34 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,5 @@ -bleach==3.3.0 -bleach-allowlist==1.0.3 Django==3.1.7 +cryptography==3.4.7 django-annoying==0.10.6 django-autocomplete-light==3.8.2 django-cleanup==5.1.0 @@ -10,6 +9,8 @@ django-filter==2.4.0 django-tables2==2.3.4 djangorestframework==3.12.4 drf-writable-nested==0.6.2 +bleach==3.3.0 +bleach-allowlist==1.0.3 gunicorn==20.1.0 lxml==4.6.3 Markdown==3.3.4 From 61ded5094fccf66a96117e4150a2ef924a64651e Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Mon, 5 Apr 2021 15:45:21 +0200 Subject: [PATCH 3/5] testing with manual wheel install --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index f53c6cec34..c65ff918b6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +wheel==0.36.2 Django==3.1.7 cryptography==3.4.7 django-annoying==0.10.6 From 7adc4ad50a2f97d0af544a3f6e96b62c4412dceb Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Mon, 5 Apr 2021 16:01:49 +0200 Subject: [PATCH 4/5] testing with newer base image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 69cab974ab..eb6291b1d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.8-alpine +FROM python:3.9-alpine3.12 #Install all dependencies. RUN apk add --no-cache postgresql-libs gettext zlib libjpeg libxml2-dev libxslt-dev py-cryptography From c7e20716f56a5bab08499e13cc7c4a282ef02ddc Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Mon, 5 Apr 2021 17:16:26 +0200 Subject: [PATCH 5/5] more testing deployments --- Dockerfile | 1 + requirements.txt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index eb6291b1d1..91b2334fd0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,6 +18,7 @@ COPY requirements.txt ./ RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-dev jpeg-dev libressl-dev libffi-dev cargo && \ python -m venv venv && \ /opt/recipes/venv/bin/python -m pip install --upgrade pip && \ + venv/bin/pip install wheel==0.36.2 && \ venv/bin/pip install -r requirements.txt --no-cache-dir &&\ apk --purge del .build-deps diff --git a/requirements.txt b/requirements.txt index c65ff918b6..f53c6cec34 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ -wheel==0.36.2 Django==3.1.7 cryptography==3.4.7 django-annoying==0.10.6