From 36e233ce584a270f9e91bcd00763bbffed6f1f95 Mon Sep 17 00:00:00 2001 From: Marco Pedone Date: Tue, 19 May 2026 19:03:15 +0200 Subject: [PATCH] docker update --- docker-compose.yml | 32 +------ old-docker-compose.yml | 205 ----------------------------------------- 2 files changed, 3 insertions(+), 234 deletions(-) delete mode 100644 old-docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml index 31301d2..9ef58bf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,6 +2,7 @@ services: db: image: postgres:18-bookworm environment: + TZ: Europe/Rome POSTGRES_USER: ${POSTGRES_USER} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_DB: ${POSTGRES_DB} @@ -37,26 +38,6 @@ services: ] restart: "no" - storage: - image: "ghcr.io/marcopedone/go_fs:latest" - expose: - - 8080 - restart: unless-stopped - pull_policy: "always" - environment: - PORT: 8080 - AUTH_TOKEN: ${STORAGE_TOKEN} - volumes: - - storage_data:/app/storage - networks: - - dokploy-network - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/health"] - interval: 10s - timeout: 5s - retries: 5 - start_period: 10s - backend: image: "${IMAGE_REGISTRY:-ghcr.io}/${OWNER:-marcopedone}/${PREFIX:-infoalloggi}-backend:${TAG:-latest}" networks: @@ -66,8 +47,7 @@ services: restart: unless-stopped pull_policy: "always" environment: - STORAGE_URL: http://storage:8080 - STORAGE_TOKEN: ${STORAGE_TOKEN} + TZ: Europe/Rome POSTGRES_USER: ${POSTGRES_USER} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_DB: ${POSTGRES_DB} @@ -81,8 +61,6 @@ services: timeout: 5s retries: 5 depends_on: - storage: - condition: service_healthy db: condition: service_healthy @@ -92,6 +70,7 @@ services: restart: unless-stopped pull_policy: "always" environment: + TZ: Europe/Rome INTERNAL_BASE_URL: http://web:3000 POSTGRES_USER: ${POSTGRES_USER} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} @@ -114,8 +93,6 @@ services: JWT_SECRET: ${JWT_SECRET} SKEBBY_USER: ${SKEBBY_USER} SKEBBY_PASS: ${SKEBBY_PASS} - STORAGE_URL: http://storage:8080 - STORAGE_TOKEN: ${STORAGE_TOKEN} networks: - dokploy-network expose: @@ -151,8 +128,6 @@ services: condition: service_healthy db: condition: service_healthy - storage: - condition: service_healthy maintenance-page: image: nginx:alpine @@ -177,5 +152,4 @@ networks: external: true volumes: - storage_data: dbdata_v18: diff --git a/old-docker-compose.yml b/old-docker-compose.yml deleted file mode 100644 index d1f354a..0000000 --- a/old-docker-compose.yml +++ /dev/null @@ -1,205 +0,0 @@ -services: - db: - build: - context: ./apps/db - dockerfile: Dockerfile - args: - POSTGRES_USER: ${POSTGRES_USER} - POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} - POSTGRES_DB: ${POSTGRES_DB} - environment: - POSTGRES_USER: ${POSTGRES_USER} - POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} - POSTGRES_DB: ${POSTGRES_DB} - restart: unless-stopped - networks: - - dokploy-network - expose: - - "5432" - volumes: - - dbdata:/var/lib/postgresql/data - healthcheck: - test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"] - interval: 1s - timeout: 5s - retries: 10 - - minio: - image: minio/minio - expose: - - "9000" - - "9001" - volumes: - - minio_storage:/data - networks: - - dokploy-network - environment: - MINIO_ROOT_USER: ${MINIO_ROOT_USER} - MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD} - command: server --console-address ":9001" /data - healthcheck: - test: [ "CMD", "curl", "-f", "http://minio:9000/minio/health/live" ] - interval: 10s - timeout: 10s - retries: 5 - - tiles: - image: eqalpha/keydb:latest - volumes: - - tiles-data:/data - networks: - - dokploy-network - expose: - - "6379" - command: keydb-server /etc/keydb/keydb.conf --maxmemory 100mb --maxmemory-policy volatile-lru --maxmemory-samples 5 - healthcheck: - test: ["CMD", "keydb-cli", "-h", "localhost", "ping"] - interval: 5s - timeout: 3s - retries: 5 - restart: unless-stopped - deploy: - resources: - limits: - cpus: "0.5" - - keydb: - image: eqalpha/keydb:latest - volumes: - - keydb-data:/data - networks: - - dokploy-network - expose: - - "6379" - healthcheck: - test: ["CMD", "keydb-cli", "-h", "localhost", "ping"] - interval: 5s - timeout: 3s - retries: 5 - restart: unless-stopped - deploy: - resources: - limits: - cpus: "0.5" - - backend: - build: - context: ./apps/backend - dockerfile: Dockerfile - networks: - - dokploy-network - expose: - - 1323 - restart: unless-stopped - volumes: - - images_volume:/app/images - - storage_volume:/app/storage - environment: - STORAGE_STRATEGY: "s3" - MINIO_URL: minio:9000 - MINIO_ROOT_USER: ${MINIO_ROOT_USER} - MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD} - POSTGRES_USER: ${POSTGRES_USER} - POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} - POSTGRES_DB: ${POSTGRES_DB} - PGHOST: db - PGPORT: "5432" - IMAGEOPTION: "true" - CONCURRENT_IMAGES: ${CONCURRENT_IMAGES} - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:1323/"] - interval: 10s - timeout: 5s - retries: 5 - depends_on: - minio: - condition: service_healthy - db: - condition: service_healthy - keydb: - condition: service_healthy - tiles: - condition: service_healthy - - web: - build: - context: ./apps/infoalloggi - dockerfile: Dockerfile - args: - INTERNAL_BASE_URL: http://web:3000 - 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} - SENDGRID_API_KEY: ${SENDGRID_API_KEY} - STRIPE_SECRET_KEY: ${STRIPE_SECRET_KEY} - NEXT_PUBLIC_STRIPE_PUBLIC_KEY: ${NEXT_PUBLIC_STRIPE_PUBLIC_KEY} - STRIPE_WEBHOOK_SECRET: ${STRIPE_WEBHOOK_SECRET} - FIC_CLIENT_ID: ${FIC_CLIENT_ID} - FIC_ACCESS_TOKEN: ${FIC_ACCESS_TOKEN} - FIC_COMPANY_ID: ${FIC_COMPANY_ID} - ARUBA_USER: ${ARUBA_USER} - ARUBA_PASS: ${ARUBA_PASS} - EXP_API_USER: ${EXP_API_USER} - EXP_API_PASS: ${EXP_API_PASS} - JWT_SECRET: ${JWT_SECRET} - SKEBBY_USER: ${SKEBBY_USER} - SKEBBY_PASS: ${SKEBBY_PASS} - STORAGE_TOKEN: ${STORAGE_TOKEN} - working_dir: /app - environment: - INTERNAL_BASE_URL: http://web:3000 - 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} - SENDGRID_API_KEY: ${SENDGRID_API_KEY} - STRIPE_SECRET_KEY: ${STRIPE_SECRET_KEY} - NEXT_PUBLIC_STRIPE_PUBLIC_KEY: ${NEXT_PUBLIC_STRIPE_PUBLIC_KEY} - STRIPE_WEBHOOK_SECRET: ${STRIPE_WEBHOOK_SECRET} - FIC_CLIENT_ID: ${FIC_CLIENT_ID} - FIC_ACCESS_TOKEN: ${FIC_ACCESS_TOKEN} - FIC_COMPANY_ID: ${FIC_COMPANY_ID} - ARUBA_USER: ${ARUBA_USER} - ARUBA_PASS: ${ARUBA_PASS} - EXP_API_USER: ${EXP_API_USER} - EXP_API_PASS: ${EXP_API_PASS} - JWT_SECRET: ${JWT_SECRET} - SKEBBY_USER: ${SKEBBY_USER} - SKEBBY_PASS: ${SKEBBY_PASS} - STORAGE_TOKEN: ${STORAGE_TOKEN} - networks: - - dokploy-network - ports: - - "3000" - depends_on: - backend: - condition: service_healthy - db: - condition: service_healthy - keydb: - condition: service_healthy - tiles: - condition: service_healthy - -networks: - dokploy-network: - external: true - -volumes: - minio_storage: - images_volume: - storage_volume: - tiles-data: - keydb-data: - dbdata: