From e11a8a2e265f10deccb0a1a007268d927432c60e Mon Sep 17 00:00:00 2001
From: zgq354 <zgq354@gmail.com>
Date: Tue, 14 Sep 2021 01:25:46 +0800
Subject: [PATCH] feat: run flarum container

---
 .gitignore         |  7 ++++---
 docker-compose.yml | 31 ++++++++++++++++++++++---------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1c31ca5..dc58b56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
 .DS_Store
+/data/app
+/data/db-data
+/data/sonic-store
+/data/redis-data
 /logs
-db-data
-sonic-store
-redis-data
 /wwwroot
 .env
diff --git a/docker-compose.yml b/docker-compose.yml
index 778acc3..625ca08 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,7 +28,8 @@ services:
       - ./logs:/var/log/nginx
       - ./nginx/nginx-conf/docker-nginx.conf:/etc/nginx/nginx.conf
       - ./nginx/nginx-conf/snippets:/etc/nginx/snippets
-      - ./wwwroot:/wwwroot
+      - ./data/app/assets:/wwwroot/public/assets
+      - app-root:/wwwroot
     links:
       - php:php
     extra_hosts:
@@ -43,9 +44,9 @@ services:
         max-size: "100m"
 
   php:
-    image: php-fpm-flarum:8.0
-    build: ./php-fpm 
-    container_name: 0xffff-php-fpm
+    image: zgq354/0xffff-flarum:latest
+    # build: ./php-fpm 
+    container_name: 0xffff-app
     depends_on:
       - redis
     restart: always
@@ -53,7 +54,10 @@ services:
       - 9000
     volumes:
       - ./logs:/var/log
-      - ./wwwroot:/wwwroot
+      - app-root:/wwwroot
+      - ./data/app/storage:/wwwroot/storage
+      - ./data/app/assets:/wwwroot/public/assets
+      - ./data/app/config.php:/wwwroot/config.php
     healthcheck:
       test: ["CMD-SHELL", "pidof php-fpm"]
       interval: 5s
@@ -65,27 +69,33 @@ services:
 
   # https://laravel-news.com/laravel-scheduler-queue-docker
   scheduler:
-    image: php-fpm-flarum:8.0
+    image: zgq354/0xffff-flarum:latest
     container_name: 0xffff-scheduler
     depends_on:
       - php
     restart: always
     volumes:
       - ./logs:/var/log
-      - ./wwwroot:/wwwroot
+      - app-root:/wwwroot
+      - ./data/app/storage:/wwwroot/storage
+      - ./data/app/assets:/wwwroot/public/assets
+      - ./data/app/config.php:/wwwroot/config.php
     environment:
       CONTAINER_ROLE: scheduler
 
   # queue worker
   queue_worker:
-    image: php-fpm-flarum:8.0
+    image: zgq354/0xffff-flarum:latest
     container_name: 0xffff-queue-worker
     depends_on:
       - php
     restart: always
     volumes:
       - ./logs:/var/log
-      - ./wwwroot:/wwwroot
+      - app-root:/wwwroot
+      - ./data/app/storage:/wwwroot/storage
+      - ./data/app/assets:/wwwroot/public/assets
+      - ./data/app/config.php:/wwwroot/config.php
     environment:
       CONTAINER_ROLE: queue
 
@@ -108,3 +118,6 @@ services:
     restart: always
     expose:
       - 1491
+
+volumes: 
+  app-root: