From 63347e82ede3d9a43e836e51cbc8ae4d992f6b5c Mon Sep 17 00:00:00 2001
From: Valentin Gehrke <madmaurice@zom.bi>
Date: Wed, 13 Jul 2016 22:43:54 +0200
Subject: [PATCH] Patches for the SSL certificate stuff

---
 Dockerfile         |  5 ++++-
 docker-compose.yml | 18 +++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index eecdbaf..b5838e5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,7 +30,10 @@ ENV DOCKER_HOST unix:///tmp/docker.sock
 
 # VOLUME ["/etc/nginx/certs"]
 # <madmaurice> Adding softlink to fit current cert structure
-RUN mkdir -p /etc/nginx/certs && ln -s /ssl/cert.crt /etc/nginx/certs/zom.bi.crt
+RUN mkdir -p /etc/nginx/certs && ln -s /ssl/cert.pem /etc/nginx/certs/zom.bi.crt && ln -s /ssl/cert.key /etc/nginx/certs/zom.bi.key
+
+# Diffie Hallman generating different primes
+RUN openssl dhparam -out /etc/nginx/certs/zom.bi.dhparam.pem 2048
 
 ENTRYPOINT ["/app/docker-entrypoint.sh"]
 CMD ["forego", "start", "-r"]
diff --git a/docker-compose.yml b/docker-compose.yml
index da052e8..0f9c010 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,9 +1,9 @@
-version: '2'
-services:
-  nginx-proxy:
-    build: .
-    container_name: nginx-proxy
-    ports:
-      - "80:80"
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
+nginxproxy:
+  build: .
+  ports:
+    - "443:443"
+    - "80:80"
+  volumes:
+    - /var/run/docker.sock:/tmp/docker.sock:ro
+  volumes_from:
+    - ssl:ro