Add user seeding SQL script and initial Docker Compose configuration

- Created a new SQL migration script to seed a default user into the USERS table. - Added a comprehensive Docker Compose configuration for the application, including services for the database, MinIO, KeyDB, backend, and web components. - Configured health checks and environment variables for each service to ensure proper startup and connectivity.
2025-10-29 11:06:53 +01:00 · 2025-10-29 11:06:53 +01:00 · 9218d2f7ac
commit 9218d2f7ac
parent a7e9f1d8ff
6 changed files with 409 additions and 499 deletions
--- a/apps/db/migrations/1_init.up.sql
+++ b/apps/db/migrations/1_init.up.sql
--- a/apps/db/migrations/2_data.up.sql
+++ b/apps/db/migrations/2_data.up.sql
--- a/apps/db/migrations/3_seed_user.up.sql
+++ b/apps/db/migrations/3_seed_user.up.sql
@ -1,14 +1,14 @@
 INSERT INTO
    PUBLIC.USERS (
-        USERNAME,
-        EMAIL,
+        username,
+        email,
        "isAdmin",
        PASSWORD,
-        NOME,
-        COGNOME,
+        nome,
+        cognome,
        "isVerified",
-        SALT,
-        TELEFONO
+        salt,
+        telefono
    )
 VALUES (
        'Marco Pedone'::TEXT,
@ -20,4 +20,5 @@ VALUES (
        TRUE::BOOLEAN,
        'a'::TEXT,
        '+393407246729'::TEXT
-    );
+    )
+ON CONFLICT (email) DO NOTHING;
--- a/deploy_marcopedone.sh
+++ b/deploy_marcopedone.sh
@ -5,7 +5,7 @@ set -euo pipefail
 export TAG="latest"
 export IMAGE_REGISTRY="ghcr.io"
 export OWNER="marcopedone"
-export SERVICES="web backend db"
+export SERVICES="web backend"
 export USERNAME="marcopedone"
 export TOKEN="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"
 export ENV_FILE=".env.marcopedone"
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,17 +1,12 @@
 services:
  db:
-    build:
-      context: ./apps/db
-      dockerfile: Dockerfile
-      args:
-        POSTGRES_USER: ${POSTGRES_USER}
-        POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-        POSTGRES_DB: ${POSTGRES_DB}
+    image: postgres:16
    environment:
      POSTGRES_USER: ${POSTGRES_USER}
      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
      POSTGRES_DB: ${POSTGRES_DB}
    restart: unless-stopped
+    pull_policy: "always"
    networks:
      - dokploy-network
    expose:
@ -23,25 +18,39 @@ services:
      interval: 1s
      timeout: 5s
      retries: 10
-
-  minio:
-    image: minio/minio
-    expose:
-      - "9000"
-      - "9001"
+  migrate:
+    image: migrate/migrate:latest
+    depends_on:
+      - db
    volumes:
-      - minio_storage:/data
+      - ./apps/db/migrations:/migrations
+    command:
+      [
+        "-path", "/migrations",
+        "-database", "postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB}?sslmode=disable",
+        "up"
+      ]
+    restart: "no"
+
+  storage:
+    image: "ghcr.io/marcopedone/go_fs:latest"
+    expose:
+      - "8080"
+    restart: unless-stopped
+    pull_policy: "always"
+    environment:
+      PORT: 8080
+      AUTH_TOKEN: ${STORAGE_TOKEN}
+    volumes:
+      - storage_data:/app/storage
    networks:
      - dokploy-network
-    environment:
-      MINIO_ROOT_USER: ${MINIO_ROOT_USER}
-      MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD}
-    command: server --console-address ":9001" /data
    healthcheck:
-      test: [ "CMD", "curl", "-f", "http://minio:9000/minio/health/live" ]
+      test: ["CMD", "curl", "-f", "http://localhost:8080/health"]
      interval: 10s
-      timeout: 10s
+      timeout: 5s
      retries: 5
+      start_period: 10s

  tiles:
    image: eqalpha/keydb:latest
@ -83,22 +92,16 @@ services:
          cpus: "0.5"

  backend:
-    build:
-      context: ./apps/backend
-      dockerfile: Dockerfile
+    image: "${IMAGE_REGISTRY:-ghcr.io}/${OWNER:-marcopedone}/${PREFIX:-infoalloggi}-backend:${TAG:-latest}"
    networks:
      - dokploy-network
    expose:
      - 1323
    restart: unless-stopped
-    volumes:
-      - images_volume:/app/images
-      - storage_volume:/app/storage
+    pull_policy: "always"
    environment:
-      STORAGE_STRATEGY: "s3"
-      MINIO_URL: minio:9000
-      MINIO_ROOT_USER: ${MINIO_ROOT_USER}
-      MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD}
+      STORAGE_URL: http://storage:8080
+      STORAGE_TOKEN: ${STORAGE_TOKEN}
      POSTGRES_USER: ${POSTGRES_USER}
      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
      POSTGRES_DB: ${POSTGRES_DB}
@ -112,7 +115,7 @@ services:
      timeout: 5s
      retries: 5
    depends_on:
-      minio:
+      storage:
        condition: service_healthy
      db:
        condition: service_healthy
@ -122,36 +125,9 @@ services:
        condition: service_healthy

  web:
-    build:
-      context: ./apps/infoalloggi
-      dockerfile: Dockerfile
-      args:
-        INTERNAL_BASE_URL: http://web:3000
-        POSTGRES_USER: ${POSTGRES_USER}
-        POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-        POSTGRES_DB: ${POSTGRES_DB}
-        PGHOST: db
-        PGPORT: "5432"
-        BACKENDSERVER_URL: http://backend:1323
-        TILES_URL: tiles:6379
-        KEYDB_URL: keydb:6379
-        BASE_URL: ${BASE_URL}
-        SENDGRID_API_KEY: ${SENDGRID_API_KEY}
-        STRIPE_SECRET_KEY: ${STRIPE_SECRET_KEY}
-        NEXT_PUBLIC_STRIPE_PUBLIC_KEY: ${NEXT_PUBLIC_STRIPE_PUBLIC_KEY}
-        STRIPE_WEBHOOK_SECRET: ${STRIPE_WEBHOOK_SECRET}
-        FIC_CLIENT_ID: ${FIC_CLIENT_ID}
-        FIC_ACCESS_TOKEN: ${FIC_ACCESS_TOKEN}
-        FIC_COMPANY_ID: ${FIC_COMPANY_ID}
-        ARUBA_USER: ${ARUBA_USER}
-        ARUBA_PASS: ${ARUBA_PASS}
-        EXP_API_USER: ${EXP_API_USER}
-        EXP_API_PASS: ${EXP_API_PASS}
-        JWT_SECRET: ${JWT_SECRET}
-        SKEBBY_USER: ${SKEBBY_USER}
-        SKEBBY_PASS: ${SKEBBY_PASS}
-        STORAGE_TOKEN: ${STORAGE_TOKEN}
+    image: "${IMAGE_REGISTRY:-ghcr.io}/${OWNER:-marcopedone}/${PREFIX:-infoalloggi}-web:${TAG:-latest}"
    working_dir: /app
+    pull_policy: "always"
    environment:
      INTERNAL_BASE_URL: http://web:3000
      POSTGRES_USER: ${POSTGRES_USER}
@ -163,7 +139,7 @@ services:
      KEYDB_URL: keydb:6379
      TILES_URL: tiles:6379
      BASE_URL: ${BASE_URL}
-      SENDGRID_API_KEY: ${SENDGRID_API_KEY}
+      NEXT_PUBLIC_BASE_URL: ${BASE_URL}
      STRIPE_SECRET_KEY: ${STRIPE_SECRET_KEY}
      NEXT_PUBLIC_STRIPE_PUBLIC_KEY: ${NEXT_PUBLIC_STRIPE_PUBLIC_KEY}
      STRIPE_WEBHOOK_SECRET: ${STRIPE_WEBHOOK_SECRET}
@ -177,6 +153,7 @@ services:
      JWT_SECRET: ${JWT_SECRET}
      SKEBBY_USER: ${SKEBBY_USER}
      SKEBBY_PASS: ${SKEBBY_PASS}
+      STORAGE_URL: http://storage:8080
      STORAGE_TOKEN: ${STORAGE_TOKEN}
    networks:
      - dokploy-network
@ -197,9 +174,7 @@ networks:
    external: true
      
 volumes:
-  minio_storage:
-  images_volume:
-  storage_volume:
+  storage_data:
  tiles-data:
  keydb-data:
  dbdata:
--- a/old-docker-compose.yml
+++ b/old-docker-compose.yml
@ -1,12 +1,17 @@
 services:
  db:
-    image: "${IMAGE_REGISTRY:-ghcr.io}/${OWNER:-marcopedone}/${PREFIX:-infoalloggi}-db:${TAG:-latest}"
+    build:
+      context: ./apps/db
+      dockerfile: Dockerfile
+      args:
+        POSTGRES_USER: ${POSTGRES_USER}
+        POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+        POSTGRES_DB: ${POSTGRES_DB}
    environment:
      POSTGRES_USER: ${POSTGRES_USER}
      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
      POSTGRES_DB: ${POSTGRES_DB}
    restart: unless-stopped
-    pull_policy: "always"
    networks:
      - dokploy-network
    expose:
@ -18,25 +23,25 @@ services:
      interval: 1s
      timeout: 5s
      retries: 10
-  storage:
-    image: "ghcr.io/marcopedone/go_fs:latest"
+
+  minio:
+    image: minio/minio
    expose:
-      - "8080"
-    restart: unless-stopped
-    pull_policy: "always"
-    environment:
-      PORT: 8080
-      AUTH_TOKEN: ${STORAGE_TOKEN}
+      - "9000"
+      - "9001"
    volumes:
-      - storage_data:/app/storage
+      - minio_storage:/data
    networks:
      - dokploy-network
+    environment:
+      MINIO_ROOT_USER: ${MINIO_ROOT_USER}
+      MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD}
+    command: server --console-address ":9001" /data
    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8080/health"]
+      test: [ "CMD", "curl", "-f", "http://minio:9000/minio/health/live" ]
      interval: 10s
-      timeout: 5s
+      timeout: 10s
      retries: 5
-      start_period: 10s

  tiles:
    image: eqalpha/keydb:latest
@ -78,16 +83,22 @@ services:
          cpus: "0.5"

  backend:
-    image: "${IMAGE_REGISTRY:-ghcr.io}/${OWNER:-marcopedone}/${PREFIX:-infoalloggi}-backend:${TAG:-latest}"
+    build:
+      context: ./apps/backend
+      dockerfile: Dockerfile
    networks:
      - dokploy-network
    expose:
      - 1323
    restart: unless-stopped
-    pull_policy: "always"
+    volumes:
+      - images_volume:/app/images
+      - storage_volume:/app/storage
    environment:
-      STORAGE_URL: http://storage:8080
-      STORAGE_TOKEN: ${STORAGE_TOKEN}
+      STORAGE_STRATEGY: "s3"
+      MINIO_URL: minio:9000
+      MINIO_ROOT_USER: ${MINIO_ROOT_USER}
+      MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD}
      POSTGRES_USER: ${POSTGRES_USER}
      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
      POSTGRES_DB: ${POSTGRES_DB}
@ -101,7 +112,7 @@ services:
      timeout: 5s
      retries: 5
    depends_on:
-      storage:
+      minio:
        condition: service_healthy
      db:
        condition: service_healthy
@ -111,9 +122,36 @@ services:
        condition: service_healthy

  web:
-    image: "${IMAGE_REGISTRY:-ghcr.io}/${OWNER:-marcopedone}/${PREFIX:-infoalloggi}-web:${TAG:-latest}"
+    build:
+      context: ./apps/infoalloggi
+      dockerfile: Dockerfile
+      args:
+        INTERNAL_BASE_URL: http://web:3000
+        POSTGRES_USER: ${POSTGRES_USER}
+        POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+        POSTGRES_DB: ${POSTGRES_DB}
+        PGHOST: db
+        PGPORT: "5432"
+        BACKENDSERVER_URL: http://backend:1323
+        TILES_URL: tiles:6379
+        KEYDB_URL: keydb:6379
+        BASE_URL: ${BASE_URL}
+        SENDGRID_API_KEY: ${SENDGRID_API_KEY}
+        STRIPE_SECRET_KEY: ${STRIPE_SECRET_KEY}
+        NEXT_PUBLIC_STRIPE_PUBLIC_KEY: ${NEXT_PUBLIC_STRIPE_PUBLIC_KEY}
+        STRIPE_WEBHOOK_SECRET: ${STRIPE_WEBHOOK_SECRET}
+        FIC_CLIENT_ID: ${FIC_CLIENT_ID}
+        FIC_ACCESS_TOKEN: ${FIC_ACCESS_TOKEN}
+        FIC_COMPANY_ID: ${FIC_COMPANY_ID}
+        ARUBA_USER: ${ARUBA_USER}
+        ARUBA_PASS: ${ARUBA_PASS}
+        EXP_API_USER: ${EXP_API_USER}
+        EXP_API_PASS: ${EXP_API_PASS}
+        JWT_SECRET: ${JWT_SECRET}
+        SKEBBY_USER: ${SKEBBY_USER}
+        SKEBBY_PASS: ${SKEBBY_PASS}
+        STORAGE_TOKEN: ${STORAGE_TOKEN}
    working_dir: /app
-    pull_policy: "always"
    environment:
      INTERNAL_BASE_URL: http://web:3000
      POSTGRES_USER: ${POSTGRES_USER}
@ -125,7 +163,7 @@ services:
      KEYDB_URL: keydb:6379
      TILES_URL: tiles:6379
      BASE_URL: ${BASE_URL}
-      NEXT_PUBLIC_BASE_URL: ${BASE_URL}
+      SENDGRID_API_KEY: ${SENDGRID_API_KEY}
      STRIPE_SECRET_KEY: ${STRIPE_SECRET_KEY}
      NEXT_PUBLIC_STRIPE_PUBLIC_KEY: ${NEXT_PUBLIC_STRIPE_PUBLIC_KEY}
      STRIPE_WEBHOOK_SECRET: ${STRIPE_WEBHOOK_SECRET}
@ -139,7 +177,6 @@ services:
      JWT_SECRET: ${JWT_SECRET}
      SKEBBY_USER: ${SKEBBY_USER}
      SKEBBY_PASS: ${SKEBBY_PASS}
-      STORAGE_URL: http://storage:8080
      STORAGE_TOKEN: ${STORAGE_TOKEN}
    networks:
      - dokploy-network
@ -160,7 +197,9 @@ networks:
    external: true
      
 volumes:
-  storage_data:
+  minio_storage:
+  images_volume:
+  storage_volume:
  tiles-data:
  keydb-data:
  dbdata: