2
0

2 کامیت‌ها 923fc8781c ... 10bb127c30

نویسنده SHA1 پیام تاریخ
  svalavuo 10bb127c30 Changes to deployment 10 ساعت پیش
  svalavuo aa3e8dd6b4 Database initialization 10 ساعت پیش
3فایلهای تغییر یافته به همراه9 افزوده شده و 4 حذف شده
  1. 5 0
      .env.with-services
  2. 1 1
      backend/setup_database.sql
  3. 3 3
      docker-compose-with-services.yml

+ 5 - 0
.env.with-services

@@ -34,3 +34,8 @@ MARIADB_PORT=3306
 
 # Redis Port (optional, for external access)
 REDIS_PORT=6379
+
+# Volumes in local filesystem
+APP_LOCATION=/some/directory
+DB_LOCATION=/some/directory
+REDIS_LOCATION=/some/directory

+ 1 - 1
backend/setup_database.sql

@@ -389,7 +389,7 @@ CREATE TABLE IF NOT EXISTS work_hours (
 
 -- Insert wavium admin user
 INSERT INTO users (username, email, password_hash, first_name, last_name, role, is_active) VALUES 
-('weikka', 'weikka@wavium.fi', '$2y$12$ZFHPKWs2AcaaYlwno7kkWOoaD0cHNWikf8kwBnetYo/QXvG8smcD6', 'Weikka', 'Valavuo', 'admin', TRUE);
+('admin', 'admin@inventory.com', '$2y$10$lIA8wG6lU0l93lacHNBS0uSGSfwqaceQpGEupzSatNcN7oG/yowC2', 'Admin', 'User', 'admin', TRUE);
 
 -- Insert expense categories data
 INSERT IGNORE INTO expense_categories (category_code, category_name, parent_id, description, is_active) VALUES

+ 3 - 3
docker-compose-with-services.yml

@@ -28,7 +28,7 @@ services:
       - UPLOAD_MAX_SIZE=${UPLOAD_MAX_SIZE:-10M}
       - ALLOWED_FILE_TYPES=${ALLOWED_FILE_TYPES:-pdf,doc,docx,xls,xlsx,jpg,jpeg,png,gif}
     volumes:
-      - ./uploads:/var/www/html/uploads
+      - ${APP_LOCATION}/uploads:/var/www/html/uploads
     restart: unless-stopped
     depends_on:
       - mariadb
@@ -52,7 +52,7 @@ services:
       - MYSQL_USER=${DB_USER:-inventory_user}
       - MYSQL_PASSWORD=${DB_PASS:-inventory_password}
     volumes:
-      - mariadb_data:/var/lib/mysql
+      - ${DB_LOCATION}/mariadb_data:/var/lib/mysql
       - ./backend/setup_database.sql:/docker-entrypoint-initdb.d/01-setup_database.sql:ro
     restart: unless-stopped
     healthcheck:
@@ -69,7 +69,7 @@ services:
     ports:
       - "${REDIS_PORT:-6379}:6379"
     volumes:
-      - redis_data:/data
+      - ${REDIS_LOCATION}/redis_data:/data
     restart: unless-stopped
     command: redis-server --appendonly yes --requirepass ${REDIS_PASSWORD:-redis_password}
     healthcheck: