fix: update API key and compose IDs in deployment script; adjust expose syntax in docker-compose
This commit is contained in:
parent
f1bd40afce
commit
9f91f97693
2 changed files with 33 additions and 9 deletions
|
|
@ -5,7 +5,7 @@ curl -X 'POST' \
|
||||||
'https://dock.marcopedone.it/api/compose.deploy' \
|
'https://dock.marcopedone.it/api/compose.deploy' \
|
||||||
-H 'accept: application/json' \
|
-H 'accept: application/json' \
|
||||||
-H 'Content-Type: application/json' \
|
-H 'Content-Type: application/json' \
|
||||||
-H 'x-api-key: gbiVIPaEQtkPywiAOIxiBtLrjKVuIqcnXXNMTzMXZoyTgJtgyLpHrlfBEqIcyEUM' \
|
-H 'x-api-key: EakRbKihguKPsveFFISahNteZqKLfSnUhMdBOqbAVAJQMzyJRPzusAtGuijlynyv' \
|
||||||
-d '{"composeId": "1Q1nPft6iaEDENfpYxq99"}'
|
-d '{"composeId": "_A6P4-1cs97gEbyec9DCE"}'
|
||||||
|
|
||||||
echo "Deployment triggered for marcopedone.it - https://dock.marcopedone.it"
|
echo "Deployment triggered for marcopedone.it - https://dock.marcopedone.it"
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ services:
|
||||||
networks:
|
networks:
|
||||||
- dokploy-network
|
- dokploy-network
|
||||||
expose:
|
expose:
|
||||||
- "5432"
|
- 5432
|
||||||
volumes:
|
volumes:
|
||||||
- dbdata:/var/lib/postgresql/data
|
- dbdata:/var/lib/postgresql/data
|
||||||
healthcheck:
|
healthcheck:
|
||||||
|
|
@ -40,7 +40,7 @@ services:
|
||||||
storage:
|
storage:
|
||||||
image: "ghcr.io/marcopedone/go_fs:latest"
|
image: "ghcr.io/marcopedone/go_fs:latest"
|
||||||
expose:
|
expose:
|
||||||
- "8080"
|
- 8080
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
pull_policy: "always"
|
pull_policy: "always"
|
||||||
environment:
|
environment:
|
||||||
|
|
@ -64,7 +64,7 @@ services:
|
||||||
networks:
|
networks:
|
||||||
- dokploy-network
|
- dokploy-network
|
||||||
expose:
|
expose:
|
||||||
- "6379"
|
- 6379
|
||||||
command: keydb-server /etc/keydb/keydb.conf --maxmemory 100mb --maxmemory-policy volatile-lru --maxmemory-samples 5
|
command: keydb-server /etc/keydb/keydb.conf --maxmemory 100mb --maxmemory-policy volatile-lru --maxmemory-samples 5
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "keydb-cli", "-h", "localhost", "ping"]
|
test: ["CMD", "keydb-cli", "-h", "localhost", "ping"]
|
||||||
|
|
@ -84,7 +84,7 @@ services:
|
||||||
networks:
|
networks:
|
||||||
- dokploy-network
|
- dokploy-network
|
||||||
expose:
|
expose:
|
||||||
- "6379"
|
- 6379
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "keydb-cli", "-h", "localhost", "ping"]
|
test: ["CMD", "keydb-cli", "-h", "localhost", "ping"]
|
||||||
interval: 5s
|
interval: 5s
|
||||||
|
|
@ -101,7 +101,7 @@ services:
|
||||||
networks:
|
networks:
|
||||||
- dokploy-network
|
- dokploy-network
|
||||||
expose:
|
expose:
|
||||||
- "3000"
|
- 3000
|
||||||
environment:
|
environment:
|
||||||
- MAX_CONCURRENT_SESSIONS=5
|
- MAX_CONCURRENT_SESSIONS=5
|
||||||
- CONNECTION_TIMEOUT=30000
|
- CONNECTION_TIMEOUT=30000
|
||||||
|
|
@ -175,8 +175,32 @@ services:
|
||||||
BROWSER_WS_URL: "ws://browserless:3000"
|
BROWSER_WS_URL: "ws://browserless:3000"
|
||||||
networks:
|
networks:
|
||||||
- dokploy-network
|
- dokploy-network
|
||||||
ports:
|
expose:
|
||||||
- "3000"
|
- 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:
|
depends_on:
|
||||||
backend:
|
backend:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue