From 01b86a55ace52ed6db7c439d848e835f224c6630 Mon Sep 17 00:00:00 2001
From: DrMxrcy <58747968+DrMxrcy@users.noreply.github.com>
Date: Tue, 21 Nov 2023 16:35:55 -0500
Subject: [PATCH] Fix Active Pieces URL and PG Healthcheck (#1664)

* Fix Active Pieces URL and PG Healthcheck

* Fix wrong port
---
 apps/activepieces/config.json        | 2 +-
 apps/activepieces/docker-compose.yml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/activepieces/config.json b/apps/activepieces/config.json
index bb9686bf..20344b8f 100644
--- a/apps/activepieces/config.json
+++ b/apps/activepieces/config.json
@@ -5,7 +5,7 @@
   "exposable": true,
   "id": "activepieces",
   "description": "Your friendliest open source all-in-one automation tool.",
-  "tipi_version": 2,
+  "tipi_version": 3,
   "version": "0.13.0",
   "categories": [
     "automation"
diff --git a/apps/activepieces/docker-compose.yml b/apps/activepieces/docker-compose.yml
index d90c2246..044ba2db 100644
--- a/apps/activepieces/docker-compose.yml
+++ b/apps/activepieces/docker-compose.yml
@@ -17,7 +17,7 @@ services:
       - AP_ENCRYPTION_KEY=${AP_ENCRYPTION_KEY}
       - AP_JWT_SECRET=${AP_JWT_SECRET}
       - AP_ENVIRONMENT=prod
-      - AP_FRONTEND_URL=http://localhost:8080
+      - AP_FRONTEND_URL=${APP_PROTOCOL:-http}://${APP_DOMAIN}
       - AP_WEBHOOK_TIMEOUT_SECONDS=30
       - AP_TRIGGER_DEFAULT_POLL_INTERVAL=5
       - AP_POSTGRES_DATABASE=activepieces
@@ -38,7 +38,7 @@ services:
       # Main
       traefik.enable: true
       traefik.http.middlewares.activepieces-web-redirect.redirectscheme.scheme: https
-      traefik.http.services.activepieces.loadbalancer.server.port: 8744
+      traefik.http.services.activepieces.loadbalancer.server.port: 80
       # Web
       traefik.http.routers.activepieces-insecure.rule: Host(`${APP_DOMAIN}`)
       traefik.http.routers.activepieces-insecure.entrypoints: web
@@ -65,7 +65,7 @@ services:
     restart: unless-stopped
     container_name: activepieces-postgres
     healthcheck:
-      test: pg_isready -U tipi
+      test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]
       interval: 30s
       timeout: 30s
       retries: 3