From 46bed52eaa6cc8718c66dc1de1755469ce07d6f4 Mon Sep 17 00:00:00 2001
From: Bruno Alla <bruno.alla@founders4schools.org.uk>
Date: Thu, 24 May 2018 20:36:00 +0100
Subject: [PATCH] Remove openssl to fix conflict with libressl

The build is currently failing with the following error:

ERROR: unsatisfiable constraints:
  openssl-dev-1.0.2o-r0:
    conflicts:
               libressl-dev-2.6.3-r0[pc:libcrypto=1.0.2o]
               libressl-dev-2.6.3-r0[pc:libssl=1.0.2o]
               libressl-dev-2.6.3-r0[pc:openssl=1.0.2o]
    satisfies: world[openssl-dev]
  libressl-dev-2.6.3-r0:
    conflicts:
               openssl-dev-1.0.2o-r0[pc:libcrypto=2.6.3]
               openssl-dev-1.0.2o-r0[pc:libssl=2.6.3]
               openssl-dev-1.0.2o-r0[pc:openssl=2.6.3]
    satisfies:
               postgresql-dev-10.4-r0[libressl-dev]

It seems to be due to a conflict between openssl and libressl.
Removing openssl to fix the problem.
---
 {{cookiecutter.project_slug}}/compose/local/django/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index df9561f71..274249548 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