From c3619c49fb9b681507ebdc3d86a98dcbfbe7a8ab Mon Sep 17 00:00:00 2001
From: Zankaria <zankaria.auxa@mailu.io>
Date: Tue, 16 Apr 2024 21:31:56 +0200
Subject: [PATCH] docker: prepare compose for multiple test instances

---
 .dockerignore      |  2 +-
 .gitignore         |  2 +-
 docker-compose.yml |  6 ++++--
 docker/doc.md      | 12 ++++++++++++
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 1b82198d..8ae84728 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,4 @@
 **/.git
 **/.gitignore
-/local-www
+/local-instances
 **/.gitkeep
diff --git a/.gitignore b/.gitignore
index 9d1640ae..5e0ab052 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,6 @@ Thumbs.db
 #vichan custom
 favicon.ico
 /static/spoiler.png
-local-www
+/local-instances
 
 /vendor/
diff --git a/docker-compose.yml b/docker-compose.yml
index f0170c7b..da45b113 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,7 +9,7 @@ services:
     depends_on:
       - db
     volumes:
-      - ./local-www:/var/www/html
+      - ./local-instances/1/www:/var/www/html
       - ./docker/nginx/vichan.conf:/etc/nginx/conf.d/default.conf
       - ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf
       - ./docker/nginx/proxy.conf:/etc/nginx/conf.d/proxy.conf
@@ -21,7 +21,7 @@ services:
       context: .
       dockerfile: ./docker/php/Dockerfile
     volumes:
-      - ./local-www:/var/www
+      - ./local-instances/1/www:/var/www
       - ./docker/php/www.conf:/usr/local/etc/php-fpm.d/www.conf
       - ./docker/php/jit.ini:/usr/local/etc/php/conf.d/jit.ini
 
@@ -36,3 +36,5 @@ services:
     environment:
       MYSQL_DATABASE: vichan
       MYSQL_ROOT_PASSWORD: password
+    volumes:
+      - ./local-instances/1/mysql:/var/lib/mysql
diff --git a/docker/doc.md b/docker/doc.md
index 13ad93a6..e022f170 100644
--- a/docker/doc.md
+++ b/docker/doc.md
@@ -2,3 +2,15 @@ The `php-fpm` process runs containerized.
 The php application always uses `/var/www` as it's work directory and home folder, and if `/var/www` is bind mounted it
 is necessary to adjust the path passed via FastCGI to `php-fpm` by changing the root directory to `/var/www`.
 This can achieved in nginx by setting the `fastcgi_param SCRIPT_FILENAME` to `/var/www/$fastcgi_script_name;`
+
+The default docker compose settings are intended for development and testing purposes.
+The folder structure expected by compose is as follows
+
+```
+<vichan-project>
+└── local-instances
+    └── 1
+        ├── mysql
+        └── www
+```
+The vichan container is by itself much less rigid.