From 3af202b8c48da92a670843b92f6bd71d2c5fe8af Mon Sep 17 00:00:00 2001 From: Bernhard Riegler Date: Wed, 31 Oct 2018 16:11:04 +0100 Subject: [PATCH 1/4] add local auth.json to ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e604ebf..179e781 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /.vscode /.vagrant docker-compose.override.yml +portal/auth.json \ No newline at end of file From 5a8e4863063afb4dd046bfd51a66455c52801577 Mon Sep 17 00:00:00 2001 From: Bernhard Riegler Date: Wed, 31 Oct 2018 16:11:27 +0100 Subject: [PATCH 2/4] use correct path to apache portal.conf --- portal-files/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-files/Dockerfile b/portal-files/Dockerfile index c2e6b2a..4b9bba1 100644 --- a/portal-files/Dockerfile +++ b/portal-files/Dockerfile @@ -47,7 +47,7 @@ RUN chmod +x /usr/local/bin/*.sh # Apache RUN rm /etc/apache2/sites-enabled/000-default.conf COPY portal-files/apache2/vhost.conf /etc/apache2/sites-enabled/000-default.conf -COPY portal-files/apache2/portal.conf /etc/apache2/ +COPY portal-files/apache2/portal.conf /etc/apache2/sites-enabled/ # Create stdout pipe for Laravel log file RUN rm -f /portal/storage/logs/laravel.log && \ From 81ebf3ab78e3ad36bcd97a851f5553f01797ece5 Mon Sep 17 00:00:00 2001 From: Bernhard Riegler Date: Wed, 7 Nov 2018 10:00:30 +0100 Subject: [PATCH 3/4] Revert "use correct path to apache portal.conf" This reverts commit 5a8e4863063afb4dd046bfd51a66455c52801577. --- portal-files/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-files/Dockerfile b/portal-files/Dockerfile index 4b9bba1..c2e6b2a 100644 --- a/portal-files/Dockerfile +++ b/portal-files/Dockerfile @@ -47,7 +47,7 @@ RUN chmod +x /usr/local/bin/*.sh # Apache RUN rm /etc/apache2/sites-enabled/000-default.conf COPY portal-files/apache2/vhost.conf /etc/apache2/sites-enabled/000-default.conf -COPY portal-files/apache2/portal.conf /etc/apache2/sites-enabled/ +COPY portal-files/apache2/portal.conf /etc/apache2/ # Create stdout pipe for Laravel log file RUN rm -f /portal/storage/logs/laravel.log && \ From ba757537d2d9ae17312d0036f0457f32d10eae5b Mon Sep 17 00:00:00 2001 From: Bernhard Riegler Date: Wed, 7 Nov 2018 12:29:36 +0100 Subject: [PATCH 4/4] mount apache conf in correct location --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 882b77c..8ae2afa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ services: volumes: - ./portal:/portal:cached - ./portal-files/apache2/vhost.conf:/etc/apache2/sites-enabled/000-default.conf - - ./portal-files/apache2/portal.conf:/etc/apache2/sites-enabled/portal.conf + - ./portal-files/apache2/portal.conf:/etc/apache2/portal.conf # https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html elasticsearch: build: ./elasticsearch