From 62ed1badc223b7e03311862db33f4273591588f1 Mon Sep 17 00:00:00 2001
From: iamBadgers <jmosrael@gmail.com>
Date: Tue, 3 Jun 2025 01:57:06 -0700
Subject: [PATCH] Add volume support to allow loader to pass data to server.

---
 app/Dockerfile               |  2 ++
 app/backend/src/db.ts        |  2 +-
 docker-compose.yaml          | 13 +++++++++++--
 loader/Dockerfile            |  4 ++++
 loader/createrushdatabase.py |  4 +---
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/app/Dockerfile b/app/Dockerfile
index 1a254a2..027923b 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -32,6 +32,8 @@ COPY --from=frontend /frontend/dist /srv/cprush-stats/frontend
 COPY --from=backend /backend/dist /srv/cprush-stats
 COPY --from=backend /backend/package.json /srv/cprush-stats/package.json
 
+VOLUME /srv/cprush-stats/data
+
 EXPOSE 3001
 ENV NODE_ENV=production
 ENV MEMCACHE_ADDR="localhost:11211"
diff --git a/app/backend/src/db.ts b/app/backend/src/db.ts
index 2cbe422..22cdbd2 100644
--- a/app/backend/src/db.ts
+++ b/app/backend/src/db.ts
@@ -25,7 +25,7 @@ export const roleNames: RoleName[] = [
   'Rocker'
 ]
 
-const databasePath = './testdb.db'
+const databasePath = './data/testdb.db'
 
 export const database = new Sequelize({
   dialect: 'sqlite',
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 3f8d992..a984cb9 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -4,22 +4,31 @@ networks:
   cprush-net:
     external: false
 
+volumes:
+  cprush-loader-data:
+
 services:
   cprush:
     # image: potato
     build: ./app
-    networks:
-      - cprush-net
     environment:
       - MEMCACHE_ADDR=memcache:11211
+    volumes:
+      - cprush-loader-data:/srv/cprush-stats/data
+    networks:
+      - cprush-net
     ports:
       - 3001:3001
     depends_on:
       - memcache
+      - loader
   loader:
     build: ./loader
     environment:
       - REPLAY_TIME=600
+    volumes:
+      - cprush-loader-data:/loader/data
+
   memcache:
     image: memcached
     networks:
diff --git a/loader/Dockerfile b/loader/Dockerfile
index 11a1c9f..2b39251 100644
--- a/loader/Dockerfile
+++ b/loader/Dockerfile
@@ -1,6 +1,10 @@
 # Setup the loader
 FROM python:3.12 AS loader
+
 COPY . /loader
+
+VOLUME /loader/data
+
 WORKDIR /loader
 RUN python -m pip install --upgrade pip
 RUN pip install -r requirements.txt
diff --git a/loader/createrushdatabase.py b/loader/createrushdatabase.py
index 36d7d33..9c02b0e 100644
--- a/loader/createrushdatabase.py
+++ b/loader/createrushdatabase.py
@@ -10,10 +10,8 @@ args = parser.parse_args()
 
 CHARACTER_DATA_OUT_FILE = "CharacterData.csv"
 GAME_DATA_OUT_FILE = "GameData.csv"
-DATABASE_NAME = "testdb.db"
+DATABASE_NAME = "data/testdb.db"
 
-
- 
 def execute():
   downloadCharactersCSV(CHARACTER_DATA_OUT_FILE)
   downloadGamesCSV(GAME_DATA_OUT_FILE)