From c62062f956f3997572c474c997a83877a00d20b9 Mon Sep 17 00:00:00 2001
From: Sam ONeill <samuel.p.oneill@gmail.com>
Date: Tue, 8 Feb 2022 13:37:06 +1300
Subject: [PATCH] Adds logs mount to pf service and adds logrotate

---
 Dockerfile                                        | 4 +++-
 development/development.sh                        | 3 ++-
 development/docker-compose.development.yml        | 2 +-
 docker-compose.yml                                | 2 +-
 static/{socket/logrotate => logrotate/pathfinder} | 0
 5 files changed, 7 insertions(+), 4 deletions(-)
 rename static/{socket/logrotate => logrotate/pathfinder} (100%)

diff --git a/Dockerfile b/Dockerfile
index e149c2e..dc27a2f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,8 +13,10 @@ RUN composer self-update 2.1.8
 RUN composer install
 
 FROM trafex/alpine-nginx-php7:ba1dd422
-RUN apk update && apk add --no-cache busybox-suid sudo php7-redis php7-pdo php7-pdo_mysql php7-fileinfo shadow gettext bash apache2-utils
 
+RUN apk update && apk add --no-cache busybox-suid sudo php7-redis php7-pdo php7-pdo_mysql php7-fileinfo shadow gettext bash apache2-utils logrotate
+
+COPY static/logrotate/pathfinder /etc/logrotate.d/pathfinder
 COPY static/nginx/nginx.conf /etc/nginx/templateNginx.conf
 # we need to create sites_enabled directory in order for entrypoint.sh being able to copy file after envsubst
 RUN mkdir -p /etc/nginx/sites_enabled/
diff --git a/development/development.sh b/development/development.sh
index 40b7e4f..6aad8f7 100755
--- a/development/development.sh
+++ b/development/development.sh
@@ -17,5 +17,6 @@ cp ./development/xdebug.ini ./static/php/xdebug.ini
 mkdir -p .vscode && cp ./development/launch.json ./.vscode/launch.json
 
 # seed .env file with dev presets
-echo "path=\"$(pwd)\"" > ./.env
+echo "PROJECT_ROOT=\"$(pwd)\"" > ./.env
 cat ./development/.env.development >> ./.env
+echo "Remember to set your CCP SSO Client and Secret keys"
diff --git a/development/docker-compose.development.yml b/development/docker-compose.development.yml
index 97f537d..c0b3710 100644
--- a/development/docker-compose.development.yml
+++ b/development/docker-compose.development.yml
@@ -36,7 +36,6 @@ services:
     volumes:
       - ${PROJECT_ROOT}/websocket:/app
       - ${PROJECT_ROOT}/logs:/var/www/html/pathfinder/history/map
-      - ${PROJECT_ROOT}/static/socket/logrotate:/etc/logrotate.d/pathfinder
     networks:
       pf:
          aliases:
@@ -68,6 +67,7 @@ services:
       - ${PROJECT_ROOT}/config/pathfinder/config.ini:/var/www/html/pathfinder/app/templateConfig.ini
       - ${PROJECT_ROOT}/config/pathfinder/pathfinder.ini:/var/www/html/pathfinder/app/pathfinder.ini
       - ${PROJECT_ROOT}/config/pathfinder/plugin.ini:/var/www/html/pathfinder/app/plugin.ini
+      - ${PROJECT_ROOT}/logs:/var/www/html/pathfinder/history/map
     depends_on:
       - pfdb
       - pf-redis
diff --git a/docker-compose.yml b/docker-compose.yml
index c70086b..9b8245b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -36,7 +36,6 @@ services:
     volumes:
       - ${PROJECT_ROOT}/websocket:/app
       - ${PROJECT_ROOT}/logs:/var/www/html/pathfinder/history/map
-      - ${PROJECT_ROOT}/static/socket/logrotate:/etc/logrotate.d/pathfinder
     networks:
       pf:
          aliases:
@@ -69,6 +68,7 @@ services:
       - ${PROJECT_ROOT}/config/pathfinder/config.ini:/var/www/html/pathfinder/app/templateConfig.ini
       - ${PROJECT_ROOT}/config/pathfinder/pathfinder.ini:/var/www/html/pathfinder/app/pathfinder.ini
       - ${PROJECT_ROOT}/config/pathfinder/plugin.ini:/var/www/html/pathfinder/app/plugin.ini
+      - ${PROJECT_ROOT}/logs:/var/www/html/pathfinder/history/map
     depends_on:
       - pfdb
       - pf-redis
diff --git a/static/socket/logrotate b/static/logrotate/pathfinder
similarity index 100%
rename from static/socket/logrotate
rename to static/logrotate/pathfinder