chore: refactor docker-compose to use improved .env configuration

DavideTarditi · DavideTarditi · commit 54dce8dfdfaa · 2025-05-12T19:33:37.000+02:00
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -34,11 +34,6 @@ jobs:
                   username: ${{ github.actor }}
                   password: ${{ secrets.GITHUB_TOKEN }}
 
-            - name: Copy and patch .env
-              run: |
-                  cp .env.example .env
-                  sed -i 's|DATABASE_HOST=localhost:5432|DATABASE_HOST=db:5432|' .env
-
             - name: Build Docker images using local compose file
               run: cd ./docker && docker compose -f docker-compose.local.yml build
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -186,18 +186,17 @@ npm run lint
 # Create Docker network if not exists
 npm run docker:create-network
 
-# Start individual Docker services
-npm run docker:db        # Start DB container
-npm run docker:api       # Start API container
-npm run docker:app       # Start app container
-npm run docker:studio    # Start Prisma Studio container
-npm run docker:cdn       # Start CDN container
+npm run docker-dev:db       # Avvia solo il container DB
+npm run docker-dev:api      # Avvia solo il container API
+npm run docker-dev:app      # Avvia solo il container frontend app
+npm run docker-dev:studio   # Avvia Prisma Studio
+npm run docker-dev:cdn      # Avvia il container CDN
 
 # Start all dev Docker services
-npm run docker
+npm run docker-dev
 
 # Start all production Docker services
-npm run docker-prod
+npm run docker
 ```
 
 ## Prisma Commands
diff --git a/README.md b/README.md
@@ -186,12 +186,12 @@ This project uses:
 2. Then, run:
 
     ```bash
-    npm run docker-prod
+    npm run docker
     ```
 
     > This command will download Poveroh's packages from cloud and will run them.
 
-    > If you want to build and run from scratch, run `npm run docker`
+    > If you want to build and run from scratch, run `npm run docker-dev`
 
 ## :handshake: Contribuite
 
diff --git a/docker/docker-compose.local.yml b/docker/docker-compose.local.yml
@@ -30,13 +30,11 @@ services:
         restart: always
         env_file: .env
         environment:
-            - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB}
+            - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DATABASE_HOST}/${POSTGRES_DB}
         ports:
             - 5555:5555
         networks:
             - poveroh_network
-        depends_on:
-            - db
 
     api:
         container_name: api
@@ -52,16 +50,14 @@ services:
         environment:
             - API_PORT=${API_PORT}
             - JWT_KEY=${JWT_KEY}
-            - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB}
+            - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DATABASE_HOST}/${POSTGRES_DB}
             - CDN_LOCAL_DATA_PATH=${CDN_LOCAL_DATA_PATH}
         ports:
             - 3001:3001
         volumes:
             - ${CDN_LOCAL_DATA_PATH}:/usr/share/cdn-data
         networks:
             - poveroh_network
-        depends_on:
-            - db
 
     app:
         container_name: app
diff --git a/docker/docker-compose.prod.yml b/docker/docker-compose.prod.yml
@@ -26,13 +26,11 @@ services:
         restart: always
         env_file: .env
         environment:
-            - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB}
+            - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DATABASE_HOST}/${POSTGRES_DB}
         ports:
             - 5555:5555
         networks:
             - poveroh_network
-        depends_on:
-            - db
 
     api:
         image: ghcr.io/poveroh/poveroh-api:latest
@@ -42,16 +40,14 @@ services:
         environment:
             - API_PORT=${API_PORT}
             - JWT_KEY=${JWT_KEY}
-            - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB}
+            - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DATABASE_HOST}/${POSTGRES_DB}
             - CDN_LOCAL_DATA_PATH=${CDN_LOCAL_DATA_PATH}
         ports:
             - 3001:3001
         volumes:
             - ${CDN_LOCAL_DATA_PATH}:/usr/share/cdn-data
         networks:
             - poveroh_network
-        depends_on:
-            - db
 
     app:
         image: ghcr.io/poveroh/poveroh-app:latest
diff --git a/package.json b/package.json
@@ -33,13 +33,13 @@
         "clean:data": "node ./scripts/data/clean-db.js",
         "format": "prettier --write \"**/*.{ts,tsx,md}\"",
         "docker:create-network": "docker network ls | grep -w poveroh_network || docker network create poveroh_network",
-        "docker:db": "npm run docker:create-network && cd ./docker && docker compose -f docker-compose.local.yml up -d --build db",
-        "docker:api": "npm run docker:create-network && cd ./docker && docker compose -f docker-compose.local.yml up -d --build api",
-        "docker:app": "npm run docker:create-network && cd ./docker && docker compose -f docker-compose.local.yml up -d --build app",
-        "docker:studio": "npm run docker:create-network && cd ./docker && docker compose -f docker-compose.local.yml up -d --build studio",
-        "docker:cdn": "npm run docker:create-network && cd ./docker && docker compose -f docker-compose.local.yml up -d --build cdn",
-        "docker": "npm run docker:create-network && cd ./docker && docker compose -f docker-compose.local.yml up -d --build",
-        "docker-prod": "npm run docker:create-network && cd ./docker && docker compose -f docker-compose.prod.yml up -d",
+        "docker-dev:db": "npm run docker:create-network && cd ./docker && docker compose -f docker-compose.local.yml up -d --build db",
+        "docker-dev:api": "npm run docker:create-network && cd ./docker && docker compose -f docker-compose.local.yml up -d --build api",
+        "docker-dev:app": "npm run docker:create-network && cd ./docker && docker compose -f docker-compose.local.yml up -d --build app",
+        "docker-dev:studio": "npm run docker:create-network && cd ./docker && docker compose -f docker-compose.local.yml up -d --build studio",
+        "docker-dev:cdn": "npm run docker:create-network && cd ./docker && docker compose -f docker-compose.local.yml up -d --build cdn",
+        "docker-dev": "npm run docker:create-network && cd ./docker && docker compose -f docker-compose.local.yml up -d --build",
+        "docker": "npm run docker:create-network && node ./scripts/docker/launch.js",
         "prepare": "husky",
         "chromatic": "cd apps/storybook && npm run chromatic"
     },
diff --git a/scripts/docker/launch.js b/scripts/docker/launch.js
@@ -0,0 +1,43 @@
+const { execSync } = require('child_process')
+const { getProjectRoot, ensureEnvFile, getEnvContent, path } = require('../utils')
+
+require('dotenv').config({ path: path.resolve(getProjectRoot(), '.env') })
+
+const projectRoot = getProjectRoot()
+const envPaths = {
+    root: path.resolve(projectRoot, '.env'),
+    example: path.resolve(projectRoot, '.env.example')
+}
+const composeFile = path.resolve(projectRoot, 'docker/docker-compose.prod.yml')
+
+try {
+    ensureEnvFile(envPaths)
+
+    let envContent = getEnvContent(envPaths.root)
+    const getEnvValue = key => {
+        const match = envContent.match(new RegExp(`^${key}=(.*)$`, 'm'))
+        return match ? match[1] : null
+    }
+
+    const DATABASE_HOST = getEnvValue('DATABASE_HOST')
+
+    if (!DATABASE_HOST) {
+        throw new Error('DATABASE_HOST is not set in .env')
+    }
+
+    const isLocalDb = DATABASE_HOST.includes('localhost') || DATABASE_HOST.includes('db')
+
+    const baseCommand = `docker compose -f ${composeFile}`
+
+    if (isLocalDb) {
+        console.log("🟢 Avvio di tutti i servizi incluso 'db'...")
+        execSync(`${baseCommand} up -d`, { stdio: 'inherit' })
+    } else {
+        console.log(`🟡 DATABASE_HOST è '${DATABASE_HOST}' -> il servizio 'db' non verrà avviato.`)
+        console.log('🟢 Avvio degli altri servizi...')
+        execSync(`${baseCommand} up -d studio api app cdn`, { stdio: 'inherit' })
+    }
+} catch (error) {
+    console.error("❌ Errore durante l'avvio dei servizi Docker:", error.message)
+    process.exit(1)
+}
diff --git a/scripts/setup/cdn.js b/scripts/setup/cdn.js
@@ -1,13 +1,13 @@
 const { execSync } = require('child_process')
-const { getProjectRoot } = require('./utils')
+const { getProjectRoot } = require('../utils')
 
 const projectRoot = getProjectRoot()
 
 try {
     execSync('npm run setup:env')
 
     console.log('Starting Docker containers...')
-    execSync('npm run docker:cdn', { stdio: 'inherit', cwd: projectRoot })
+    execSync('npm run docker-dev:cdn', { stdio: 'inherit', cwd: projectRoot })
     console.log('✅ CDN setup completed!')
 } catch (error) {
     console.error('❌ Error during setup:', error)
diff --git a/scripts/setup/db.js b/scripts/setup/db.js
@@ -1,11 +1,18 @@
-const { getProjectRoot, path } = require('./utils')
+const { getProjectRoot, path, getEnvContent } = require('../utils')
 const { execSync } = require('child_process')
+const fs = require('fs')
 
 const projectRoot = getProjectRoot()
 const prismaPath = path.join(projectRoot, 'packages/prisma')
+const envPath = path.join(projectRoot, '.env')
+
+const getEnvValue = (content, key) => {
+    const match = content.match(new RegExp(`^${key}=(.*)$`, 'm'))
+    return match ? match[1] : null
+}
 
 try {
-    execSync('npm run setup:env')
+    execSync('npm run setup:env', { stdio: 'inherit' })
 
     // Check if Docker is running
     try {
@@ -15,9 +22,29 @@ try {
         throw new Error('Docker is not running. Please start Docker and try again.')
     }
 
-    console.log('Starting Docker containers...')
-    execSync('npm run docker:db', { stdio: 'inherit', cwd: projectRoot })
-    execSync('npm run docker:studio', { stdio: 'inherit', cwd: projectRoot })
+    // Load .env and check DATABASE_HOST
+    if (!fs.existsSync(envPath)) {
+        throw new Error('.env file not found.')
+    }
+
+    const envContent = getEnvContent(envPath)
+    const databaseHost = getEnvValue(envContent, 'DATABASE_HOST')
+
+    if (!databaseHost) {
+        throw new Error('DATABASE_HOST is not set in .env')
+    }
+
+    const isLocalDb = databaseHost === 'localhost:5432' || databaseHost === 'db:5432'
+
+    if (isLocalDb) {
+        console.log(`🟢 DATABASE_HOST is '${databaseHost}', starting local DB container...`)
+        execSync('npm run docker-dev:db', { stdio: 'inherit', cwd: projectRoot })
+    } else {
+        console.log(`🟡 DATABASE_HOST is '${databaseHost}', skipping local DB container.`)
+    }
+
+    console.log('Starting Prisma Studio container...')
+    execSync('npm run docker-dev:studio', { stdio: 'inherit', cwd: projectRoot })
 
     console.log('Generating Prisma client...')
     execSync('npx prisma generate', { stdio: 'inherit', cwd: prismaPath })
diff --git a/scripts/setup/env.js b/scripts/setup/env.js
@@ -1,5 +1,5 @@
 const crypto = require('crypto')
-const { getProjectRoot, ensureEnvFile, getEnvContent, saveEnvContent, path, fs } = require('./utils')
+const { getProjectRoot, ensureEnvFile, getEnvContent, saveEnvContent, path, fs } = require('../utils')
 
 const projectRoot = getProjectRoot()
 const envPaths = {
diff --git a/scripts/utils.js b/scripts/utils.js
@@ -2,7 +2,7 @@ const { existsSync, copyFileSync, readFileSync, writeFileSync, mkdirSync } = req
 const path = require('path')
 
 function getProjectRoot() {
-    return path.resolve(__dirname, '../..')
+    return path.resolve(__dirname, '..')
 }
 
 function ensureEnvFile(envPaths) {
