From 666ebe0335fe12aa1ad065a565825f12e918f1b4 Mon Sep 17 00:00:00 2001
From: Daniel <d.knudsen@spawntree.de>
Date: Mon, 26 Sep 2022 10:41:53 +0200
Subject: [PATCH] wip

---
 Dockerfile                        | 30 +++++++++++++-----------------
 Dockerfile_ssl => Dockerfile_http | 18 ++++++++++--------
 docker-compose.yml                |  6 +++---
 3 files changed, 26 insertions(+), 28 deletions(-)
 rename Dockerfile_ssl => Dockerfile_http (83%)

diff --git a/Dockerfile b/Dockerfile
index c44a2fc..a218751 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,6 +10,7 @@ RUN apt-get update
 
 RUN apt-get install -y \
         libfreetype6-dev \
+        git zip \
         libjpeg62-turbo-dev \
         libpng-dev \
         libicu-dev \
@@ -19,8 +20,6 @@ RUN apt-get install -y \
     && docker-php-ext-install -j$(nproc) intl \
     && docker-php-ext-install -j$(nproc) pdo_mysql
 
-RUN apt-get install -y git zip
-
 RUN pecl install xdebug \
     && docker-php-ext-enable xdebug \
     && echo "xdebug.mode=debug" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
@@ -38,31 +37,28 @@ RUN chmod +x /install_composer.sh \
     && rm /install_composer.sh \
     && mv /composer.phar /usr/local/bin/composer
 
-#RUN a2enmod rewrite && a2enmod ssl && a2enmod socache_shmcb
-RUN a2enmod rewrite
+RUN a2enmod rewrite && a2enmod ssl && a2enmod socache_shmcb
 #RUN a2enmod rewrite && a2enmod ssl
-#COPY ./.docker/apache/httpd.conf /etc/apache2/sites-available/httpd.conf
-#COPY ./.docker/apache/httpd.conf /etc/apache2/conf-available/httpd.conf
+COPY ./.docker/apache/httpd.conf /etc/apache2/sites-available/httpd.conf
+COPY ./.docker/apache/httpd.conf /etc/apache2/conf-available/httpd.conf
 
-#COPY ./cert/mycert.crt /etc/ssl/certs/mycert.crt
-#COPY ./cert/mycert.key /etc/ssl/private/mycert.key
+COPY ./cert/mycert.crt /etc/ssl/certs/mycert.crt
+COPY ./cert/mycert.key /etc/ssl/private/mycert.key
 
 RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
 RUN sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
 #RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/httpd.conf
 #RUN sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/httpd.conf
-#RUN sed -i '/SSLCertificateFile.*snakeoil\.pem/c\SSLCertificateFile \/etc\/ssl\/certs\/mycert.crt' /etc/apache2/sites-available/*.conf
-#RUN sed -i '/SSLCertificateKeyFile.*snakeoil\.key/cSSLCertificateKeyFile /etc/ssl/private/mycert.key\' /etc/apache2/sites-available/*.conf
-#RUN sed -i '/SSLCertificateFile.*snakeoil\.pem/c\SSLCertificateFile \/etc\/ssl\/certs\/mycert.crt' /etc/apache2/sites-enabled/*.conf
-#RUN sed -i '/SSLCertificateKeyFile.*snakeoil\.key/cSSLCertificateKeyFile /etc/ssl/private/mycert.key\' /etc/apache2/sites-enabled/*.conf
+RUN sed -i '/SSLCertificateFile.*snakeoil\.pem/c\SSLCertificateFile \/etc\/ssl\/certs\/mycert.crt' /etc/apache2/sites-available/*.conf
+RUN sed -i '/SSLCertificateKeyFile.*snakeoil\.key/cSSLCertificateKeyFile /etc/ssl/private/mycert.key\' /etc/apache2/sites-available/*.conf
+RUN sed -i '/SSLCertificateFile.*snakeoil\.pem/c\SSLCertificateFile \/etc\/ssl\/certs\/mycert.crt' /etc/apache2/sites-enabled/*.conf
+RUN sed -i '/SSLCertificateKeyFile.*snakeoil\.key/cSSLCertificateKeyFile /etc/ssl/private/mycert.key\' /etc/apache2/sites-enabled/*.conf
 
 #RUN sed -i '/SSLCertificateFile.*snakeoil\.pem/c\SSLCertificateFile /etc/ssl/certs/mycert.crt' /etc/apache2/sites-available/default-ssl.conf
 #RUN sed -i '/SSLCertificateKeyFile.*snakeoil\.key/cSSLCertificateKeyFile /etc/ssl/private/mycert.key\' /etc/apache2/sites-available/default-ssl.conf
 
-RUN #a2ensite default-ssl
-RUN a2ensite 000-default
-#RUN apt-get update && apt-get upgrade -y
-#RUN a2ensite httpd
+#RUN a2ensite default-ssl
+RUN a2ensite httpd
 
 RUN mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini"
 
@@ -79,7 +75,7 @@ RUN chmod +x /init.sh
 
 RUN rm -rf /var/www/html/contao/var/cache/*
 EXPOSE 80
-#EXPOSE 443
+EXPOSE 443
 
 #USER www-data
 
diff --git a/Dockerfile_ssl b/Dockerfile_http
similarity index 83%
rename from Dockerfile_ssl
rename to Dockerfile_http
index 1f2ad4d..c44a2fc 100644
--- a/Dockerfile_ssl
+++ b/Dockerfile_http
@@ -38,13 +38,14 @@ RUN chmod +x /install_composer.sh \
     && rm /install_composer.sh \
     && mv /composer.phar /usr/local/bin/composer
 
-RUN a2enmod rewrite && a2enmod ssl && a2enmod socache_shmcb
+#RUN a2enmod rewrite && a2enmod ssl && a2enmod socache_shmcb
+RUN a2enmod rewrite
 #RUN a2enmod rewrite && a2enmod ssl
 #COPY ./.docker/apache/httpd.conf /etc/apache2/sites-available/httpd.conf
 #COPY ./.docker/apache/httpd.conf /etc/apache2/conf-available/httpd.conf
 
-COPY ./cert/mycert.crt /etc/ssl/certs/mycert.crt
-COPY ./cert/mycert.key /etc/ssl/private/mycert.key
+#COPY ./cert/mycert.crt /etc/ssl/certs/mycert.crt
+#COPY ./cert/mycert.key /etc/ssl/private/mycert.key
 
 RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
 RUN sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
@@ -55,11 +56,12 @@ RUN sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf
 #RUN sed -i '/SSLCertificateFile.*snakeoil\.pem/c\SSLCertificateFile \/etc\/ssl\/certs\/mycert.crt' /etc/apache2/sites-enabled/*.conf
 #RUN sed -i '/SSLCertificateKeyFile.*snakeoil\.key/cSSLCertificateKeyFile /etc/ssl/private/mycert.key\' /etc/apache2/sites-enabled/*.conf
 
-RUN sed -i '/SSLCertificateFile.*snakeoil\.pem/c\SSLCertificateFile /etc/ssl/certs/mycert.crt' /etc/apache2/sites-available/default-ssl.conf
-RUN sed -i '/SSLCertificateKeyFile.*snakeoil\.key/cSSLCertificateKeyFile /etc/ssl/private/mycert.key\' /etc/apache2/sites-available/default-ssl.conf
+#RUN sed -i '/SSLCertificateFile.*snakeoil\.pem/c\SSLCertificateFile /etc/ssl/certs/mycert.crt' /etc/apache2/sites-available/default-ssl.conf
+#RUN sed -i '/SSLCertificateKeyFile.*snakeoil\.key/cSSLCertificateKeyFile /etc/ssl/private/mycert.key\' /etc/apache2/sites-available/default-ssl.conf
 
-RUN a2ensite default-ssl
-RUN apt-get update && apt-get upgrade -y
+RUN #a2ensite default-ssl
+RUN a2ensite 000-default
+#RUN apt-get update && apt-get upgrade -y
 #RUN a2ensite httpd
 
 RUN mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini"
@@ -77,7 +79,7 @@ RUN chmod +x /init.sh
 
 RUN rm -rf /var/www/html/contao/var/cache/*
 EXPOSE 80
-EXPOSE 443
+#EXPOSE 443
 
 #USER www-data
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 72256c7..ba5c968 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,10 +22,10 @@ services:
     container_name: contao
     ports:
       - '8089:80'
-      #- '8090:443'
+      - '8090:443'
     volumes:
-#      - ./cert/mycert.crt:/etc/ssl/certs/mycert.crt
-#      - ./cert/mycert.key:/etc/ssl/private/mycert.key
+      - ./cert/mycert.crt:/etc/ssl/certs/mycert.crt
+      - ./cert/mycert.key:/etc/ssl/private/mycert.key
       - ./app:/var/www/html
     networks:
       - default