Actualizando booru

stacks/booru/.env.example

@@ -2,15 +2,14 @@ APP_NAME="booru archive"
 APP_ENV=production
 APP_KEY=
 APP_DEBUG=false
-APP_URL=
+APP_URL=http://localhost
-
-OCTANE_SERVER=frankenphp
 
 APP_LOCALE=en
 APP_FALLBACK_LOCALE=en
 APP_FAKER_LOCALE=en_US
 
 APP_MAINTENANCE_DRIVER=file
+
 BCRYPT_ROUNDS=12
 
 LOG_CHANNEL=stack
@@ -18,10 +17,13 @@ LOG_STACK=single
 LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
-DB_CONNECTION=sqlite
+DB_CONNECTION=pgsql
-DB_DATABASE=/app/storage/database/database.sqlite
+DB_HOST=postgres
+DB_PORT=5432
+DB_DATABASE=booru-archive
+DB_USERNAME=booru-archive
+DB_PASSWORD=secret
 
-SESSION_DRIVER=database
 SESSION_LIFETIME=120
 SESSION_ENCRYPT=false
 SESSION_PATH=/
@@ -29,8 +31,14 @@ SESSION_DOMAIN=null
 
 BROADCAST_CONNECTION=log
 FILESYSTEM_DISK=local
-QUEUE_CONNECTION=database
+FILESYSTEM_MEDIA_DISK=media
 
-CACHE_STORE=database
+REDIS_HOST=redis
+REDIS_PASSWORD=null
+REDIS_PORT=6379
 
-VITE_APP_NAME="${APP_NAME}"
+DATA_DIR='/tmp/booru-archive'
+
+SESSION_DRIVER=redis
+QUEUE_CONNECTION=redis
+CACHE_STORE=redis

stacks/booru/compose.traefik.yml

@@ -1,8 +1,6 @@
 services:
   app:
-    volumes:
+    ports: !reset []
-      - ${DATA_DIR}/database:/app/storage/database
-      - ${DATA_DIR}/media:/app/storage/app/media
     labels:
       - traefik.enable=true
       - traefik.docker.network=traefik
@@ -17,16 +15,6 @@ services:
       - default
       - traefik
 
-  queue:
-    volumes:
-      - ${DATA_DIR}/database:/app/storage/database
-      - ${DATA_DIR}/media:/app/storage/app/media
-
-  scheduler:
-    volumes:
-      - ${DATA_DIR}/database:/app/storage/database
-      - ${DATA_DIR}/media:/app/storage/app/media
-
 networks:
   traefik:
     external: true

stacks/booru/compose.yml

@@ -1,23 +1,76 @@
-x-app: &app
-  image: git.skrd.fun/skrd/booru-archive:latest
-  env_file:
-    - .env
-  restart: unless-stopped
-
 services:
   app:
-    <<: *app
+    image: git.skrd.fun/skrd/booru-archive:latest
+    restart: unless-stopped
+    env_file:
+      - .env
     environment:
       CONTAINER_ROLE: web
+    ports:
+      - "8080:80"
+    volumes:
+      - ${DATA_DIR}/media:/app/storage/app/media
+    depends_on:
+      postgres:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
 
   queue:
-    <<: *app
+    image: git.skrd.fun/skrd/booru-archive:latest
+    restart: unless-stopped
+    env_file:
+      - .env
     environment:
       CONTAINER_ROLE: queue
       RUN_MIGRATIONS: "0"
+    volumes:
+      - ${DATA_DIR}/media:/app/storage/app/media
+    depends_on:
+      postgres:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
 
   scheduler:
-    <<: *app
+    image: git.skrd.fun/skrd/booru-archive:latest
+    restart: unless-stopped
+    env_file:
+      - .env
     environment:
       CONTAINER_ROLE: scheduler
       RUN_MIGRATIONS: "0"
+    volumes:
+      - ${DATA_DIR}/media:/app/storage/app/media
+    depends_on:
+      postgres:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+
+  postgres:
+    image: postgres:17
+    restart: unless-stopped
+    environment:
+      POSTGRES_DB: ${DB_DATABASE}
+      POSTGRES_USER: ${DB_USERNAME}
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+    volumes:
+      - ${DATA_DIR}/postgres:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  redis:
+    image: redis:8
+    restart: unless-stopped
+    command: ["redis-server", "--appendonly", "yes"]
+    volumes:
+      - ${DATA_DIR}/redis:/data
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 5