Actualización de uso de entornos

docker-compose.override.yml

@@ -2,35 +2,32 @@
 # Docker Comose para entorno de desarrollo o development.
 
 services:
-
+  npm:
-  nginx-proxy-manager:
     image: jc21/nginx-proxy-manager:latest
-    container_name: nginx-proxy-manager
     restart: unless-stopped
     depends_on:
-      suitecoffee-app:
+      app:
         condition: service_healthy
-      suitecoffee-auth:
+      auth:
         condition: service_healthy
     ports:
       - "80:80"     # HTTP público
       - "81:81"     # UI de administración NPM
       - "443:443"   # HTTPS público
     volumes:
-      - dev-npm_data:/data               # config + DB (SQLite)
+      - npm_data:/data               # config + DB (SQLite)
-      - dev-npm_letsencrypt:/etc/letsencrypt
+      - npm_letsencrypt:/etc/letsencrypt
     networks:
       - suitecoffee-net
 
 
 
-  suitecoffee-app:
+  app:
     image: node:20-bookworm
-    container_name: suitecoffee-app
     depends_on:
-      suitecoffee-db:
+      db:
         condition: service_healthy
-      suitecoffee-tenants:
+      tenants:
         condition: service_healthy
     ports:
       - 3000:3000
@@ -58,11 +55,10 @@ services:
 
 
 
-  suitecoffee-auth:
+  auth:
     image: node:20-bookworm
-    container_name: suitecoffee-auth
     depends_on:
-      suitecoffee-db:
+      db:
         condition: service_healthy
     ports:
       - 4000:4000
@@ -86,9 +82,8 @@ services:
     networks:
       - suitecoffee-net
 
-  suitecoffee-db:
+  db:
     image: postgres:16
-    container_name: suitecoffee-db
     environment:
       POSTGRES_DB: ${DB_NAME}
       POSTGRES_USER: ${DB_USER}
@@ -96,7 +91,7 @@ services:
     ports:
       - ${DB_LOCAL_PORT}:${DB_DOCKER_PORT}
     volumes:
-      - dev-suitecoffee-data:/var/lib/postgresql/data
+      - suitecoffee-db:/var/lib/postgresql/data
     restart: unless-stopped
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U ${DB_USER} -d ${DB_NAME}"]
@@ -107,15 +102,14 @@ services:
     networks:
       - suitecoffee-net
 
-  suitecoffee-tenants:
+  tenants:
     image: postgres:16
-    container_name: suitecoffee-tenants
     environment:
       POSTGRES_DB: ${TENANTS_DB_NAME}
       POSTGRES_USER: ${TENANTS_DB_USER}
       POSTGRES_PASSWORD: ${TENANTS_DB_PASS}
     volumes:
-      - dev-tenants-data:/var/lib/postgresql/data
+      - tenants-db:/var/lib/postgresql/data
     ports:
       - ${TENANTS_DB_LOCAL_PORT}:${TENANTS_DB_DOCKER_PORT}
     restart: unless-stopped
@@ -128,40 +122,26 @@ services:
     networks:
       - suitecoffee-net
 
-  suitecoffee-dbeaver:
+  dbeaver:
     image: dbeaver/cloudbeaver:latest
-    container_name: suitecoffee-dbeaver
+    # depends_on:
-    depends_on:
+    #   tenants:
-      suitecoffee-tenants:
+    #     condition: service_healthy
-        condition: service_healthy
+    #   db:
-      suitecoffee-db:
+    #     condition: service_healthy
-        condition: service_healthy
     restart: unless-stopped
     ports:
       - 8978:8978
     volumes:
-      - dev-dbeaver_logs:/opt/cloudbeaver/logs
+      - dbeaver_logs:/opt/cloudbeaver/logs
-      - dev-dbeaver_workspace:/opt/cloudbeaver/workspace
+      - dbeaver_workspace:/opt/cloudbeaver/workspace
     networks:
       - suitecoffee-net
       
-  # suitecoffee-adminer:
-  #   image: adminer:latest
-  #   container_name: suitecoffee-adminer
-  #   restart: unless-stopped
-  #   ports:
-  #     - 8080:8080
-  #   depends_on:
-  #     suitecoffee-tenants:
-  #       condition: service_healthy
-  #     suitecoffee-db:
-  #       condition: service_healthy
-  #   networks:
-  #     - suitecoffee-net
-    
 volumes:
-  tenants-data:
+  tenants-db:
-  suitecoffee-data:
+  suitecoffee-db:
+  
   npm_data:
   npm_letsencrypt:
   dbeaver_logs:

docker-compose.yml

@@ -3,15 +3,13 @@
 name: ${COMPOSE_PROJECT_NAME:-suitecoffee}
 
 services:
-
+  npm:
-  nginx-proxy-manager:
     image: jc21/nginx-proxy-manager:latest
-    container_name: nginx-proxy-manager
     restart: unless-stopped
     depends_on:
-      suitecoffee-app:
+      app:
         condition: service_healthy
-      suitecoffee-auth:
+      auth:
         condition: service_healthy
     ports:
       - "80:80"     # HTTP público
@@ -23,12 +21,11 @@ services:
     networks:
       - suitecoffee-net
 
-  suitecoffee-app:
+  app:
-    container_name: suitecoffee-app
     depends_on:
-      suitecoffee-db:
+      db:
         condition: service_healthy
-      suitecoffee-tenants:
+      tenants:
         condition: service_healthy
     build:
       context: ./services/app
@@ -51,10 +48,9 @@ services:
     networks:
       - suitecoffee-net
 
-  suitecoffee-auth:
+  auth:
-    container_name: suitecoffee-auth
     depends_on:
-      suitecoffee-db:
+      db:
         condition: service_healthy
     build:
       context: ./services/auth
@@ -76,15 +72,14 @@ services:
     networks:
       - suitecoffee-net
 
-  suitecoffee-db:
+  db:
     image: postgres:16
-    container_name: suitecoffee-db
     environment:
       POSTGRES_DB: ${DB_NAME}
       POSTGRES_USER: ${DB_USER}
       POSTGRES_PASSWORD: ${DB_PASS}
     volumes:
-      - suitecoffee-data:/var/lib/postgresql/data
+      - suitecoffee-db:/var/lib/postgresql/data
     restart: unless-stopped
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U ${DB_USER} -d ${DB_NAME}"]
@@ -95,15 +90,14 @@ services:
     networks:
       - suitecoffee-net
 
-  suitecoffee-tenants:
+  tenants:
     image: postgres:16
-    container_name: suitecoffee-tenants
     environment:
       POSTGRES_DB: ${TENANTS_DB_NAME}
       POSTGRES_USER: ${TENANTS_DB_USER}
       POSTGRES_PASSWORD: ${TENANTS_DB_PASS}
     volumes:
-      - tenants-data:/var/lib/postgresql/data
+      - tenants-db:/var/lib/postgresql/data
     restart: unless-stopped
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U ${TENANTS_DB_USER} -d ${TENANTS_DB_NAME}"]
@@ -114,14 +108,13 @@ services:
     networks:
       - suitecoffee-net
 
-  suitecoffee-dbeaver:
+  dbeaver:
     image: dbeaver/cloudbeaver:latest
-    container_name: suitecoffee-dbeaver
+    # depends_on:
-    depends_on:
+    #   tenants:
-      suitecoffee-tenants:
+    #     condition: service_healthy
-        condition: service_healthy
+    #   db:
-      suitecoffee-db:
+    #     condition: service_healthy
-        condition: service_healthy
     restart: unless-stopped
     ports:
       - "8978:8978"
@@ -131,23 +124,10 @@ services:
     networks:
       - suitecoffee-net
 
-  # suitecoffee-adminer:
-  #   image: adminer:latest
-  #   container_name: suitecoffee-adminer
-  #   restart: unless-stopped
-  #   ports:
-  #     - "8080:8080"
-  #   depends_on:
-  #     suitecoffee-tenants:
-  #       condition: service_healthy
-  #     suitecoffee-db:
-  #       condition: service_healthy
-  #   networks:
-  #     - suitecoffee-net
-    
 volumes:
-  tenants-data:
+  tenants-db:
-  suitecoffee-data:
+  suitecoffee-db:
+
   npm_data:
   npm_letsencrypt:
   dbeaver_logs:

services/app/src/index.js

@@ -23,7 +23,7 @@ try {
     dotenv.config({ path: path.resolve(__dirname, '../.env.test' )});
     console.log(`Activando entorno de ->->${chalk.yellow(` TESTING `)}`);
   } else if (process.env.NODE_ENV === 'production') {
-    dotenv.config({ path: path.resolve(__dirname, '../.env' )});
+    dotenv.config({ path: path.resolve(__dirname, '../.env.production' )});
     console.log(`Activando entorno de ->->${chalk.red(` PRODUCTION `)}`);
   }
 } catch (error) {

services/auth/src/index.js

@@ -24,7 +24,7 @@ try {
     dotenv.config({ path: path.resolve(__dirname, '../.env.test' )});
     console.log(`Activando entorno de ->->${chalk.yellow(` TESTING `)}`);
   } else if (process.env.NODE_ENV === 'production') {
-    dotenv.config({ path: path.resolve(__dirname, '../.env' )});
+    dotenv.config({ path: path.resolve(__dirname, '../.env.production' )});
     console.log(`Activando entorno de ->->${chalk.red(` PRODUCTION `)}`);
   }
 } catch (error) {