From 15fc2e0f620a41aae6b06009fe0df138d12e595e Mon Sep 17 00:00:00 2001 From: Kikimanox Date: Mon, 29 Aug 2022 15:20:21 +0200 Subject: [PATCH] fixed docker specific paths so that everything works... --- docker-compose.yml | 2 +- swagger_server/requets_db/models/vrsta.py | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8e477e6..f66e02b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,4 +8,4 @@ services: - 8080:8080 volumes: # when pushing to server, remove the first dot here in front of /mnt - ./mnt/ssd/ds_ftp/classla_OS2022:/usr/src/app/classla_OS2022 - - ./swagger_server/classla/classla_resources:/root/classla_resource + - ./swagger_server/classla/classla_resources:/root/classla_resources diff --git a/swagger_server/requets_db/models/vrsta.py b/swagger_server/requets_db/models/vrsta.py index d21d502..2443180 100644 --- a/swagger_server/requets_db/models/vrsta.py +++ b/swagger_server/requets_db/models/vrsta.py @@ -2,13 +2,18 @@ from peewee import * from datetime import datetime import os -if not os.path.exists('requets_db/dbs'): - print("---!--- requests_db/dbs doesn't exist") - print("lsing .") - print(os.listdir('.')) - os.mkdir('./requets_db/dbs') +LOCAL_PATH = "requets_db/dbs" +SERVER_PATH = "swagger_server/requets_db/dbs" -DB = 'requets_db/dbs/jobs.db' +if not os.path.exists(LOCAL_PATH): + if os.path.exists('requets_db'): + os.makedirs(LOCAL_PATH, exist_ok=True) + elif os.path.exists('swagger_server/requets_db'): + os.makedirs(SERVER_PATH, exist_ok=True) + +DB = f'{LOCAL_PATH}/jobs.db' +if not os.path.exists(LOCAL_PATH): + DB = f'{SERVER_PATH}/jobs.db' db = SqliteDatabase(DB, pragmas={ # 'journal_mode': 'wal', 'cache_size': -1 * 128 * 1024, # 128MB