diff --git a/docker-compose.override.yml b/docker-compose.override.yml index f8fbab4..b53afcd 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -34,7 +34,7 @@ services: user: "${UID:-1000}:${GID:-1000}" volumes: - ./services/app:/app:rw - - ./node_modules:/app/node_modules + - ./services/app/node_modules:/app/node_modules env_file: - ./services/app/.env.development environment: @@ -51,9 +51,6 @@ services: networks: - suitecoffee-net - - - auth: image: node:20-bookworm depends_on: @@ -65,7 +62,7 @@ services: user: "${UID:-1000}:${GID:-1000}" volumes: - ./services/auth:/app:rw - - ./node_modules:/app/node_modules + - ./services/auth/node_modules:/app/node_modules env_file: - ./services/auth/.env.development environment: diff --git a/docker-compose.yml b/docker-compose.yml index 8b7d502..4d00ef7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,11 +29,11 @@ services: condition: service_healthy build: context: ./services/app - dockerfile: Dockerfile.development + dockerfile: Dockerfile.production volumes: - ./services/app:/app env_file: - - ./services/app/.env.development + - ./services/app/.env.production environment: - NODE_ENV=${NODE_ENV} command: npm run start @@ -54,11 +54,11 @@ services: condition: service_healthy build: context: ./services/auth - dockerfile: Dockerfile.development + dockerfile: Dockerfile.production volumes: - ./services/auth:/app env_file: - - ./services/auth/.env.development + - ./services/auth/.env.production environment: - NODE_ENV=${NODE_ENV} command: npm run start @@ -110,11 +110,11 @@ services: dbeaver: image: dbeaver/cloudbeaver:latest - # depends_on: - # tenants: - # condition: service_healthy - # db: - # condition: service_healthy + depends_on: + tenants: + condition: service_healthy + db: + condition: service_healthy restart: unless-stopped ports: - "8978:8978" diff --git a/services/app/Dockerfile.development b/services/app/Dockerfile.production similarity index 100% rename from services/app/Dockerfile.development rename to services/app/Dockerfile.production diff --git a/services/app/package-lock.json b/services/app/package-lock.json index 545664b..0a0679e 100644 --- a/services/app/package-lock.json +++ b/services/app/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "chalk": "^5.5.0", + "chalk": "^5.6.0", "cors": "^2.8.5", "dotenv": "^17.2.1", "express": "^5.1.0", diff --git a/services/app/package.json b/services/app/package.json index 0a70056..4a110e7 100644 --- a/services/app/package.json +++ b/services/app/package.json @@ -15,7 +15,7 @@ "nodemon": "^3.1.10" }, "dependencies": { - "chalk": "^5.5.0", + "chalk": "^5.6.0", "cors": "^2.8.5", "dotenv": "^17.2.1", "express": "^5.1.0", diff --git a/services/auth/Dockerfile.development b/services/auth/Dockerfile.production similarity index 100% rename from services/auth/Dockerfile.development rename to services/auth/Dockerfile.production diff --git a/services/auth/package-lock.json b/services/auth/package-lock.json index 03122c0..68a228c 100644 --- a/services/auth/package-lock.json +++ b/services/auth/package-lock.json @@ -10,7 +10,7 @@ "license": "ISC", "dependencies": { "bcrypt": "^5.1.1", - "chalk": "^5.5.0", + "chalk": "^5.6.0", "cors": "^2.8.5", "dotenv": "^17.2.1", "express": "^5.1.0", diff --git a/services/auth/package.json b/services/auth/package.json index 0660f1c..3ffd613 100644 --- a/services/auth/package.json +++ b/services/auth/package.json @@ -16,7 +16,7 @@ }, "dependencies": { "bcrypt": "^5.1.1", - "chalk": "^5.5.0", + "chalk": "^5.6.0", "cors": "^2.8.5", "dotenv": "^17.2.1", "express": "^5.1.0", diff --git a/services/auth/src/index.js b/services/auth/src/index.js index b4f1759..19ca656 100644 --- a/services/auth/src/index.js +++ b/services/auth/src/index.js @@ -1,5 +1,5 @@ // auth/src/index.js -import chalk from 'chalk'; // Colores! +import chalk from 'chalk'; import express from 'express'; import expressLayouts from 'express-ejs-layouts'; import cors from 'cors';