From 9f91f97693c6d023ba2ee912ffad6d07844e4a86 Mon Sep 17 00:00:00 2001 From: Marco Pedone Date: Tue, 3 Mar 2026 10:53:07 +0100 Subject: [PATCH] fix: update API key and compose IDs in deployment script; adjust expose syntax in docker-compose --- deploy_marcopedone.sh | 4 ++-- docker-compose.yml | 38 +++++++++++++++++++++++++++++++------- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/deploy_marcopedone.sh b/deploy_marcopedone.sh index cc5d474..4440ef4 100644 --- a/deploy_marcopedone.sh +++ b/deploy_marcopedone.sh @@ -5,7 +5,7 @@ curl -X 'POST' \ 'https://dock.marcopedone.it/api/compose.deploy' \ -H 'accept: application/json' \ -H 'Content-Type: application/json' \ - -H 'x-api-key: gbiVIPaEQtkPywiAOIxiBtLrjKVuIqcnXXNMTzMXZoyTgJtgyLpHrlfBEqIcyEUM' \ - -d '{"composeId": "1Q1nPft6iaEDENfpYxq99"}' + -H 'x-api-key: EakRbKihguKPsveFFISahNteZqKLfSnUhMdBOqbAVAJQMzyJRPzusAtGuijlynyv' \ + -d '{"composeId": "_A6P4-1cs97gEbyec9DCE"}' echo "Deployment triggered for marcopedone.it - https://dock.marcopedone.it" diff --git a/docker-compose.yml b/docker-compose.yml index b0bd61c..b7058ff 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ services: networks: - dokploy-network expose: - - "5432" + - 5432 volumes: - dbdata:/var/lib/postgresql/data healthcheck: @@ -40,7 +40,7 @@ services: storage: image: "ghcr.io/marcopedone/go_fs:latest" expose: - - "8080" + - 8080 restart: unless-stopped pull_policy: "always" environment: @@ -64,7 +64,7 @@ services: networks: - dokploy-network expose: - - "6379" + - 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"] @@ -84,7 +84,7 @@ services: networks: - dokploy-network expose: - - "6379" + - 6379 healthcheck: test: ["CMD", "keydb-cli", "-h", "localhost", "ping"] interval: 5s @@ -101,7 +101,7 @@ services: networks: - dokploy-network expose: - - "3000" + - 3000 environment: - MAX_CONCURRENT_SESSIONS=5 - CONNECTION_TIMEOUT=30000 @@ -175,8 +175,32 @@ services: BROWSER_WS_URL: "ws://browserless:3000" networks: - dokploy-network - ports: - - "3000" + expose: + - 3000 + labels: + - "traefik.enable=true" + # HTTP ROUTER + - "traefik.http.routers.app-http.rule=Host(`${DOMAIN}`) || Host(`www.${DOMAIN}`)" + - "traefik.http.routers.app-http.entrypoints=web" + - "traefik.http.routers.app-http.service=app-http" + - "traefik.http.routers.app-http.middlewares=redirect-to-https@file" + - "traefik.http.services.app-http.loadbalancer.server.port=3000" + # HTTPS FOR WWW + - "traefik.http.routers.app-www.rule=Host(`www.${DOMAIN}`)" + - "traefik.http.routers.app-www.entrypoints=websecure" + - "traefik.http.routers.app-www.service=app" + - "traefik.http.routers.app-www.tls.certresolver=letsencrypt" + - "traefik.http.routers.app-www.middlewares=redirect-apex" + # APEX REDIRECT + - "traefik.http.middlewares.redirect-apex.redirectregex.regex=^https?://www\\.${DOMAIN//./\\.}/(.*)" + - "traefik.http.middlewares.redirect-apex.redirectregex.replacement=https://${DOMAIN}/$${1}" + - "traefik.http.middlewares.redirect-apex.redirectregex.permanent=true" + # CANONICAL DOMAIN + - "traefik.http.routers.app.rule=Host(`${DOMAIN}`)" + - "traefik.http.routers.app.entrypoints=websecure" + - "traefik.http.routers.app.service=app" + - "traefik.http.routers.app.tls.certresolver=letsencrypt" + - "traefik.http.services.app.loadbalancer.server.port=3000" depends_on: backend: condition: service_healthy