From c3b9f72f31b1af960f18c042f30630e33e1a7d68 Mon Sep 17 00:00:00 2001 From: Michel Sassano Date: Fri, 25 May 2018 08:21:22 +0200 Subject: [PATCH] Remove openssl to fix unsatisfiable constraints error with libressl (#1661) Removed the openssl-dev package from the Django Dockerfiles (local and production) to fix the unsatisfiable constraints error. The error appears because you can't have openssl and libressl installed at the same time. One of the package used by the template/project installs libressl which create an error when trying to install openssl. Thx to @browniebroke --- {{cookiecutter.project_slug}}/compose/local/django/Dockerfile | 2 +- .../compose/production/django/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile index df9561f7..27424954 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile @@ -9,7 +9,7 @@ RUN apk update \ # Pillow dependencies && apk add jpeg-dev zlib-dev freetype-dev lcms2-dev openjpeg-dev tiff-dev tk-dev tcl-dev \ # CFFI dependencies - && apk add libffi-dev openssl-dev py-cffi \ + && apk add libffi-dev py-cffi \ # Translations dependencies && apk add gettext \ # https://docs.djangoproject.com/en/dev/ref/django-admin/#dbshell diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile index bcebd4b5..7ae8a7cb 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile @@ -9,7 +9,7 @@ RUN apk update \ # Pillow dependencies && apk add jpeg-dev zlib-dev freetype-dev lcms2-dev openjpeg-dev tiff-dev tk-dev tcl-dev \ # CFFI dependencies - && apk add libffi-dev openssl-dev py-cffi + && apk add libffi-dev py-cffi RUN addgroup -S django \ && adduser -S -G django django