From 796f370f65f6f01e0deee90578cca85f24fec21d Mon Sep 17 00:00:00 2001
From: Dale Wahl <dalewahl@gmail.com>
Date: Thu, 12 Oct 2023 15:48:12 +0200
Subject: [PATCH] update docker-compose_build.yml to store volumes in 4cat/data
 folder by default

---
 .gitignore               |  1 -
 data/.gitignore          |  4 ++++
 docker-compose_build.yml | 14 +++++++-------
 3 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 data/.gitignore

diff --git a/.gitignore b/.gitignore
index bd0d52375..359213488 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,6 @@ module_cache.pb
 webtool/fourcat/js/jquery-csv-master/
 webtool/fourcat/static/data/word_embeddings/
 *.session
-data/
 webtool/fourcat/static/boards.json
 webtool/pages/reject-template.md
 webtool/pages/access-policy.md
diff --git a/data/.gitignore b/data/.gitignore
new file mode 100644
index 000000000..4e2a98bb1
--- /dev/null
+++ b/data/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except these files
+!.gitignore
diff --git a/docker-compose_build.yml b/docker-compose_build.yml
index 48a53747e..4b893ee97 100644
--- a/docker-compose_build.yml
+++ b/docker-compose_build.yml
@@ -10,7 +10,7 @@ services:
       - POSTGRES_DB=${POSTGRES_DB}
       - POSTGRES_HOST_AUTH_METHOD=${POSTGRES_HOST_AUTH_METHOD}
     volumes:
-      - 4cat_db:/var/lib/postgresql/data/
+      - ./data/postgres/:/var/lib/postgresql/data/
     healthcheck:
       test: [ "CMD-SHELL", "pg_isready -U $${POSTGRES_USER}" ]
       interval: 5s
@@ -31,9 +31,9 @@ services:
     ports:
       - ${PUBLIC_API_PORT}:4444
     volumes:
-      - 4cat_data:/usr/src/app/data/
-      - 4cat_config:/usr/src/app/config/
-      - 4cat_logs:/usr/src/app/logs/
+      - ./data/datasets/:/usr/src/app/data/
+      - ./data/config/:/usr/src/app/config/
+      - ./data/logs/:/usr/src/app/logs/
     entrypoint: docker/docker-entrypoint.sh
 
   frontend:
@@ -46,9 +46,9 @@ services:
       - ${PUBLIC_PORT}:5000
       - ${TELEGRAM_PORT}:443
     volumes:
-      - 4cat_data:/usr/src/app/data/
-      - 4cat_config:/usr/src/app/config/
-      - 4cat_logs:/usr/src/app/logs/
+      - ./data/datasets/:/usr/src/app/data/
+      - ./data/config/:/usr/src/app/config/
+      - ./data/logs/:/usr/src/app/logs/
     command: ["docker/wait-for-backend.sh", "gunicorn", "--worker-tmp-dir", "/dev/shm", "--workers", "2", "--threads", "4", "--worker-class", "gthread", "--access-logfile", "/usr/src/app/logs/access_gunicorn.log", "--log-level", "info", "--bind", "0.0.0.0:5000", "webtool:app"]
 
 volumes: