From cc190d733d2fc2548066e035398d187f1c894afc Mon Sep 17 00:00:00 2001
From: Bart Geesink <bart.geesink@surf.nl>
Date: Tue, 30 Jan 2024 13:46:22 +0100
Subject: [PATCH] Add logging in Docker to log to stdout

---
 docker/Dockerfile.prod  | 14 +++++++++-----
 docker/conf/logging.yml | 22 ++++++++++++++++++++++
 2 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 docker/conf/logging.yml

diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod
index 677dde360..2e7bdb192 100644
--- a/docker/Dockerfile.prod
+++ b/docker/Dockerfile.prod
@@ -1,11 +1,15 @@
-FROM ghcr.io/openconext/openconext-basecontainers/php72-apache2:latest AS php-build
-COPY *.tar.bz2 /tmp/
-RUN tar -xvjf /tmp/*.tar.bz2 -C /var/www/html/ && \
-  rm -rf /tmp/*.tar.bz2
+FROM ghcr.io/openconext/openconext-basecontainers/php72-apache2:latest
+COPY  ./*tar.gz  /tmp/
+RUN tar --strip-components=1 -xvzf /tmp/*tar.gz -C /var/www/html/ && \
+    rm -rf /tmp/*.tar.gz
 
 # Add the config files for Apache2
 RUN rm -rf /etc/apache2/sites-enabled/*
-COPY ./docker/php-fpm/apache2.conf /etc/apache2/sites-enabled/apache2.conf
+COPY ./docker/conf/engine.conf /etc/apache2/sites-enabled/engine.conf
+COPY ./docker/conf/logging.yml /var/www/html/app/config/
+RUN mkdir /var/www/html/app/cache && \
+    chmod -R 777 /var/www/html/app/cache/ && \
+    chmod 777 /var/www/html/app/logs/
 
 # Set the default workdir
 WORKDIR /var/www/html
diff --git a/docker/conf/logging.yml b/docker/conf/logging.yml
new file mode 100644
index 000000000..87bb4c4b2
--- /dev/null
+++ b/docker/conf/logging.yml
@@ -0,0 +1,22 @@
+monolog:
+    channels: ["%logger.channel%", "authentication"]
+    handlers:
+        main:
+            type: fingers_crossed
+            activation_strategy: engineblock.logger.manual_or_error_activation_strategy
+            passthru_level: "%logger.fingers_crossed.passthru_level%"
+            handler: stderr
+            channels: ["!authentication"]
+        stderr:
+            type:      stream
+            path:      php://stderr
+            ident:     "%logger.syslog.ident%"
+            formatter: engineblock.logger.additional_info_formatter
+        authentication:
+            type:      stream
+            path:      php://stderr
+            ident:     EBAUTH
+            facility:  user
+            level:     INFO
+            channels:  [authentication]
+            formatter: engineblock.logger.formatter.syslog_json