From b6877119456ed8a32ae826d722533ce5ca4ed87f Mon Sep 17 00:00:00 2001
From: shrkz1 <martin@eramba.org>
Date: Mon, 10 Oct 2022 22:08:26 +0200
Subject: [PATCH] Test new SSL approach

---
 .github/workflows/Docker.yml      | 2 +-
 Dockerfile                        | 4 ++++
 docker-compose.simple-install.yml | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/Docker.yml b/.github/workflows/Docker.yml
index 5600042..56d9b70 100644
--- a/.github/workflows/Docker.yml
+++ b/.github/workflows/Docker.yml
@@ -188,7 +188,7 @@ jobs:
         with:
           context: eramba
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          file: eramba/app/upgrade/vendor/eramba/docker/Dockerfile
+          file: eramba/Dockerfile
           builder: ${{ steps.buildx.outputs.name }}
           target: eramba
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/Dockerfile b/Dockerfile
index 4375e6c..2b09f6c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,6 +20,10 @@ RUN apt-get update && apt-get install -y rsync
 # Setup vhost
 COPY app/upgrade/vendor/eramba/docker/apache/vhost.conf /etc/apache2/sites-available/000-default.conf
 
+# Copy keys
+COPY app/upgrade/vendor/eramba/docker/apache/ssl/mycert.crt /etc/ssl/certs/mycert.crt
+COPY app/upgrade/vendor/eramba/docker/apache/ssl/mycert.key /etc/ssl/private/mycert.key
+
 # Setup php
 COPY app/upgrade/vendor/eramba/docker/php/php.ini /usr/local/etc/php/php.ini
 
diff --git a/docker-compose.simple-install.yml b/docker-compose.simple-install.yml
index 54a17e0..ac9956f 100644
--- a/docker-compose.simple-install.yml
+++ b/docker-compose.simple-install.yml
@@ -27,6 +27,7 @@ services:
       - app:/var/www/eramba
       - ./apache/ssl/mycert.crt:/etc/ssl/certs/mycert.crt
       - ./apache/ssl/mycert.key:/etc/ssl/private/mycert.key
+      - ./apache/vhost.conf:/etc/apache2/sites-available/000-default.conf
     env_file:
       - main.env
     links: