diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 7e6fd82..7df9df0 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -17,12 +17,15 @@ services: - "81:81" # UI de administración NPM - "443:443" # HTTPS público volumes: - - npm_data:/data # config + DB (SQLite) - - npm_letsencrypt:/etc/letsencrypt + - dev-npm_data:/data # config + DB (SQLite) + - dev-npm_letsencrypt:/etc/letsencrypt networks: - suitecoffee-net + + suitecoffee-app: + image: node:20-bookworm container_name: suitecoffee-app depends_on: suitecoffee-db: @@ -31,9 +34,11 @@ services: condition: service_healthy ports: - 3000:3000 + working_dir: /app + user: "${UID:-1000}:${GID:-1000}" volumes: - - ./services/app:/app - - /app/node_modules + - ./services/app:/app:rw + - ./node_modules:/app/node_modules env_file: - ./services/app/.env.development environment: @@ -50,16 +55,22 @@ services: networks: - suitecoffee-net + + + suitecoffee-auth: + image: node:20-bookworm container_name: suitecoffee-auth depends_on: suitecoffee-db: condition: service_healthy ports: - 4000:4000 + working_dir: /app + user: "${UID:-1000}:${GID:-1000}" volumes: - - ./services/auth:/app - - /app/node_modules + - ./services/app:/app:rw + - ./node_modules:/app/node_modules env_file: - ./services/auth/.env.development environment: @@ -83,9 +94,9 @@ services: POSTGRES_USER: ${DB_USER} POSTGRES_PASSWORD: ${DB_PASS} ports: - - 54321:5432 + - ${DB_LOCAL_PORT}:${DB_DOCKER_PORT} volumes: - - suitecoffee-data:/var/lib/postgresql/data + - dev-suitecoffee-data:/var/lib/postgresql/data restart: unless-stopped healthcheck: test: ["CMD-SHELL", "pg_isready -U ${DB_USER} -d ${DB_NAME}"] @@ -104,9 +115,9 @@ services: POSTGRES_USER: ${TENANTS_DB_USER} POSTGRES_PASSWORD: ${TENANTS_DB_PASS} volumes: - - tenants-data:/var/lib/postgresql/data + - dev-tenants-data:/var/lib/postgresql/data ports: - - 54322:5432 + - ${TENANTS_DB_LOCAL_PORT}:${TENANTS_DB_DOCKER_PORT} restart: unless-stopped healthcheck: test: ["CMD-SHELL", "pg_isready -U ${TENANTS_DB_USER} -d ${TENANTS_DB_NAME}"] @@ -129,8 +140,8 @@ services: ports: - 8978:8978 volumes: - - dbeaver_logs:/opt/cloudbeaver/logs - - dbeaver_workspace:/opt/cloudbeaver/workspace + - dev-dbeaver_logs:/opt/cloudbeaver/logs + - dev-dbeaver_workspace:/opt/cloudbeaver/workspace networks: - suitecoffee-net @@ -149,12 +160,12 @@ services: # - suitecoffee-net volumes: - tenants-data: - suitecoffee-data: - npm_data: - npm_letsencrypt: - dbeaver_logs: - dbeaver_workspace: + dev-tenants-data: + dev-suitecoffee-data: + dev-npm_data: + dev-npm_letsencrypt: + dev-dbeaver_logs: + dev-dbeaver_workspace: networks: suitecoffee-net: diff --git a/package.json b/package.json index 17f91c3..0e5633a 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,6 @@ { "dependencies": { - "app": "file:services/app" + "app": "file:services/app", + "auth": "file:services/auth" } } diff --git a/services/app/nodemon.json b/services/app/nodemon.json deleted file mode 100644 index 8402eff..0000000 --- a/services/app/nodemon.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "watch": ["src"], - "ext": "js,json", - "ignore": [ - "node_modules/**/node_modules", - "node_modules/", - ".git" - ], - "env": { - "NODE_ENV": "development" - }, - "exec": "node ./src/index.js" -} \ No newline at end of file diff --git a/services/app/package-lock.json b/services/app/package-lock.json index da37a04..a564d47 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.3.0", + "chalk": "^5.5.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 12400e8..aa4b52c 100644 --- a/services/app/package.json +++ b/services/app/package.json @@ -1,10 +1,10 @@ { - "name": "app", + "name": "suitecoffee_aplication_service", "version": "1.0.0", "main": "index.js", "scripts": { "start": "NODE_ENV=production node ./src/index.js", - "dev": "npx nodemon", + "dev": "NODE_ENV=development npx nodemon ./src/index.js", "test": "NODE_ENV=stage node ./src/index.js" }, "author": "Mateo Saldain", @@ -15,7 +15,7 @@ "nodemon": "^3.1.10" }, "dependencies": { - "chalk": "^5.3.0", + "chalk": "^5.5.0", "cors": "^2.8.5", "dotenv": "^17.2.1", "express": "^5.1.0", diff --git a/services/auth/nodemon.json b/services/auth/nodemon.json deleted file mode 100644 index 8402eff..0000000 --- a/services/auth/nodemon.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "watch": ["src"], - "ext": "js,json", - "ignore": [ - "node_modules/**/node_modules", - "node_modules/", - ".git" - ], - "env": { - "NODE_ENV": "development" - }, - "exec": "node ./src/index.js" -} \ No newline at end of file diff --git a/services/auth/package-lock.json b/services/auth/package-lock.json index f6ba842..e9def4c 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.3.0", + "chalk": "^5.5.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 a8f1511..1f8b182 100644 --- a/services/auth/package.json +++ b/services/auth/package.json @@ -1,10 +1,10 @@ { - "name": "auth", + "name": "suitecoffee_authentication_service", "version": "1.0.0", "main": "index.js", "scripts": { "start": "NODE_ENV=production node ./src/index.js", - "dev": "npx nodemon", + "dev": "NODE_ENV=development npx nodemon ./src/index.js", "test": "NODE_ENV=stage node ./src/index.js" }, "author": "Mateo Saldain", @@ -16,7 +16,7 @@ }, "dependencies": { "bcrypt": "^5.1.1", - "chalk": "^5.3.0", + "chalk": "^5.5.0", "cors": "^2.8.5", "dotenv": "^17.2.1", "express": "^5.1.0", diff --git a/services/auth/src/pages/index.html b/services/auth/src/pages/index.html index 9fef017..5498420 100644 --- a/services/auth/src/pages/index.html +++ b/services/auth/src/pages/index.html @@ -1,10 +1,12 @@ +
Hola!