From 60f05d52e7bfc5f281f9994a9176fa4e97f268a5 Mon Sep 17 00:00:00 2001 From: Marco Pedone Date: Fri, 5 Sep 2025 16:59:41 +0200 Subject: [PATCH] feat: add dev-docker-compose.yml for environment configuration and update hostname handling in next.config.mjs --- apps/infoalloggi/.docker_env | 24 ---------- ...ker-compose.yml => dev-docker-compose.yml} | 45 ++++++++++--------- apps/infoalloggi/next.config.mjs | 2 +- 3 files changed, 26 insertions(+), 45 deletions(-) delete mode 100644 apps/infoalloggi/.docker_env rename apps/infoalloggi/{docker-compose.yml => dev-docker-compose.yml} (66%) diff --git a/apps/infoalloggi/.docker_env b/apps/infoalloggi/.docker_env deleted file mode 100644 index 927d34c..0000000 --- a/apps/infoalloggi/.docker_env +++ /dev/null @@ -1,24 +0,0 @@ -#Api key for the mail service -SENDGRID_API_KEY='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' - -#Stripe keys -STRIPE_SECRET_KEY = "sk_test_51P4IY3ILe4KoQRqXJJLyn33Dvb4z3ajTrMsGD4y8g4DWXMbPQcoqOAcvedemB83xn0FIdVAMGX1hk8gXYog1BXl700cRUngUET" -NEXT_PUBLIC_STRIPE_PUBLIC_KEY = "pk_test_51P4IY3ILe4KoQRqXXUVDyiVEy9oiKdzDIB9xgDY054xVRyVZ5dfWoJlo1F5dXlQ6sEATwgylPp708PQEf2uhagUx00qcL0rRgq" -STRIPE_WEBHOOK_SECRET = "whsec_a1a62f5c31b2ade9237af6032e30392dda47f945e2eddd7e2f69579f1fb47118" - -#Fatture in Cloud keys -FIC_CLIENT_ID = "ggZlcim78qkRYrl5n2d8DpNoKGiqwRHa" -FIC_ACCESS_TOKEN = "a/eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyZWYiOiJ2Z2VOWFhST0JyZUliN3dNMFFpM0NpdXFhb1VHTzBlciJ9.ewEBe0Qq4ATNyx03rTTynWHhhxYvjuCB-ra8XBJV_B0" -FIC_COMPANY_ID = "120838" - - -#ARUBA EMAIL -ARUBA_USER = "web@infoalloggi.it" -ARUBA_PASS = "we2023Info.1" - -#EXPOSED API AUTH -EXP_API_USER = "infoalloggi-admin" -EXP_API_PASS = "cyYk24u9fRn5DsqjFWpTV8GKBNwhQvEtbMmHxJeU73ZSaXrdCLAPg6NtDkC43ZQa9dVKHbxMv7fWpy65gFmAsEReXwuPYTL82jJnSUhrzcqGkqvsHPyxmEAFzYVSntGeQTr25dJb3UNCMuRpgwaDW69Zhc7Kj8LfB4ZCHR9kYfWVsGrx7tygqdvc82SFXj54Nhnpm6PEBLbKUuaMTQJeA3wDgPSCXwDVmhned6J8ZQ3qzNsr5bBuLtHxvFTAKGy74W2fY9pckjMRUEJYRkVPZwbvBtTKy2F8ULAseunzWj7G5d6Q3ExfmNCXqg4MDahH9cSruXyWxLNAsGQTPSFhD9HYVzB3Meg2rk5Cvacfq8mdZ6tUE4KRpwbn7jJAev7WRbVgPdncMLKxwm8yT9pQZ4DNUkaYj6ztXfhsBHqF5ErCu32Gcjb3H6KxvWsu9p5fkPrh7ZARXMLDdS82enFU4CqwztTayEmGNVgYJB" - - -JWT_SECRET = "335922ae76f8334dd11fa2614434624017ee21bffea95e355c0ac0a3b4e717193cdefbe4fadb5dac98939d6c4cd8b3158d530ebc8bb670281300efe5d5642fec" \ No newline at end of file diff --git a/apps/infoalloggi/docker-compose.yml b/apps/infoalloggi/dev-docker-compose.yml similarity index 66% rename from apps/infoalloggi/docker-compose.yml rename to apps/infoalloggi/dev-docker-compose.yml index e5b93cb..40f9bd9 100644 --- a/apps/infoalloggi/docker-compose.yml +++ b/apps/infoalloggi/dev-docker-compose.yml @@ -1,20 +1,19 @@ services: web: - platform: "linux/amd64" build: context: . dockerfile: Dockerfile args: - INTERNAL_BASE_URL: http://web:3000 + INTERNAL_BASE_URL: ${INTERNAL_BASE_URL} 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} + PGHOST: host.docker.internal + PGPORT: ${PGPORT} + BACKENDSERVER_URL: http://host.docker.internal:1323 + TILES_URL: host.docker.internal:6379 + KEYDB_URL: host.docker.internal:6380 + BASE_URL: ${NEXT_PUBLIC_BASE_URL} SENDGRID_API_KEY: ${SENDGRID_API_KEY} STRIPE_SECRET_KEY: ${STRIPE_SECRET_KEY} NEXT_PUBLIC_STRIPE_PUBLIC_KEY: ${NEXT_PUBLIC_STRIPE_PUBLIC_KEY} @@ -29,16 +28,16 @@ services: JWT_SECRET: ${JWT_SECRET} working_dir: /app environment: - INTERNAL_BASE_URL: http://web:3000 + INTERNAL_BASE_URL: ${INTERNAL_BASE_URL} POSTGRES_USER: ${POSTGRES_USER} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_DB: ${POSTGRES_DB} - PGHOST: db - PGPORT: "5432" - BACKENDSERVER_URL: http://backend:1323 - KEYDB_URL: keydb:6379 - TILES_URL: tiles:6379 - BASE_URL: ${BASE_URL} + PGHOST: host.docker.internal + PGPORT: ${PGPORT} + BACKENDSERVER_URL: http://host.docker.internal:1323 + TILES_URL: host.docker.internal:6379 + KEYDB_URL: host.docker.internal:6380 + BASE_URL: ${NEXT_PUBLIC_BASE_URL} SENDGRID_API_KEY: ${SENDGRID_API_KEY} STRIPE_SECRET_KEY: ${STRIPE_SECRET_KEY} NEXT_PUBLIC_STRIPE_PUBLIC_KEY: ${NEXT_PUBLIC_STRIPE_PUBLIC_KEY} @@ -51,11 +50,17 @@ services: EXP_API_USER: ${EXP_API_USER} EXP_API_PASS: ${EXP_API_PASS} JWT_SECRET: ${JWT_SECRET} - networks: - - dokploy-network ports: - - "3000" + - "3000:3000" + networks: + - base + extra_hosts: + - "host.docker.internal:host-gateway" networks: - dokploy-network: - external: true + base: + driver: bridge + + + + diff --git a/apps/infoalloggi/next.config.mjs b/apps/infoalloggi/next.config.mjs index b1637f3..d81e48c 100644 --- a/apps/infoalloggi/next.config.mjs +++ b/apps/infoalloggi/next.config.mjs @@ -39,7 +39,7 @@ const nextConfig = { protocol: "https", }, { - hostname: env.BACKENDSERVER_URL || "localhost:1323", + hostname: `${env.BACKENDSERVER_URL}`, }, ], },