cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2024-11-26 11:34:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove openssl to fix unsatisfiable constraints error with libressl (#1661)

Browse Source 
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
This commit is contained in:
Michel Sassano 2018-05-25 08:21:22 +02:00 committed by Wan Liuyang
parent 39c825a262
commit c3b9f72f31
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
View File

@ -9,7 +9,7 @@ RUN apk update \
# Pillow dependencies # Pillow dependencies
&& apk add jpeg-dev zlib-dev freetype-dev lcms2-dev openjpeg-dev tiff-dev tk-dev tcl-dev \ && apk add jpeg-dev zlib-dev freetype-dev lcms2-dev openjpeg-dev tiff-dev tk-dev tcl-dev \
# CFFI dependencies # CFFI dependencies
&& apk add libffi-dev openssl-dev py-cffi \ && apk add libffi-dev py-cffi \
# Translations dependencies # Translations dependencies
&& apk add gettext \ && apk add gettext \
# https://docs.djangoproject.com/en/dev/ref/django-admin/#dbshell # https://docs.djangoproject.com/en/dev/ref/django-admin/#dbshell

2
{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
View File

@ -9,7 +9,7 @@ RUN apk update \
# Pillow dependencies # Pillow dependencies
&& apk add jpeg-dev zlib-dev freetype-dev lcms2-dev openjpeg-dev tiff-dev tk-dev tcl-dev \ && apk add jpeg-dev zlib-dev freetype-dev lcms2-dev openjpeg-dev tiff-dev tk-dev tcl-dev \
# CFFI dependencies # CFFI dependencies
&& apk add libffi-dev openssl-dev py-cffi && apk add libffi-dev py-cffi
RUN addgroup -S django \ RUN addgroup -S django \
&& adduser -S -G django django && adduser -S -G django django