Merge branch 'main' of https://github.com/panoratech/Panora

panoratech · Sep 5, 2024 · 4acfbc5 · 4acfbc5
2 parents 2e253c9 + ccd4c8e
commit 4acfbc5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/docker.export.backend.selfhosted.yml b/.github/workflows/docker.export.backend.selfhosted.yml
@@ -35,7 +35,7 @@ jobs:
           build-args: |
             PANORA_BASE_API_URL=${{ env.PANORA_BASE_API_URL }}
             DISTRIBUTION=${{ env.DISTRIBUTION }}
-            ENV=${{ ENV }}
+            ENV=${{ env.ENV }}
             DATABASE_URL=postgresql://${{env.POSTGRES_USER}}:${{secrets.POSTGRES_PASSWORD}}@${{env.POSTGRES_HOST}}:5432/${{env.POSTGRES_DB}}?ssl=false
             JWT_SECRET=${{ secrets.JWT_SECRET }}
             REDIS_HOST=redis
@@ -50,3 +50,4 @@ jobs:
             ZENDESK_CLIENT_SECRET=${{ secrets.ZENDESK_CLIENT_SECRET }}
             ZENDESK_TICKETING_CLIENT_ID=${{ secrets.ZENDESK_TICKETING_CLIENT_ID }}
             ZENDESK_TICKETING_CLIENT_SECRET=${{ secrets.ZENDESK_TICKETING_CLIENT_SECRET }}
+            REDIRECT_TUNNEL_INGRESS=${{ env.REDIRECT_TUNNEL_INGRESS}}
diff --git a/.github/workflows/docker.export.frontend-dashboard.selfhosted.yml b/.github/workflows/docker.export.frontend-dashboard.selfhosted.yml
@@ -36,5 +36,5 @@ jobs:
             NEXT_PUBLIC_BACKEND_DOMAIN=${{ secrets.NEXT_PUBLIC_BACKEND_DOMAIN }}
             NEXT_PUBLIC_MAGIC_LINK_DOMAIN=${{ secrets.NEXT_PUBLIC_MAGIC_LINK_DOMAIN }}
             NEXT_PUBLIC_DISTRIBUTION=${{ env.DISTRIBUTION }}
-            NEXT_PUBLIC_REDIRECT_WEBHOOK_INGRESS=${{ secrets.NEXT_PUBLIC_REDIRECT_WEBHOOK_INGRESS }}
+            NEXT_PUBLIC_REDIRECT_WEBHOOK_INGRESS=${{ env.NEXT_PUBLIC_REDIRECT_WEBHOOK_INGRESS }}
             NEXT_PUBLIC_WEBAPP_DOMAIN= ${{env.NEXT_PUBLIC_WEBAPP_DOMAIN}}
diff --git a/docker-compose.source.yml b/docker-compose.source.yml
@@ -36,7 +36,7 @@ services:
       DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:5432/${POSTGRES_DB}?ssl=false
       DISTRIBUTION: ${DISTRIBUTION}
       WEBHOOK_INGRESS: ${WEBHOOK_INGRESS}
-      REDIRECT_TUNNEL_INGRESS: ${REDIRECT_TUNNEL_INGRESS}
+      REDIRECT_TUNNEL_INGRESS: "https://panora-contributors-redirect.rachid-7e5.workers.dev/http://localhost:3000"
       JWT_SECRET: ${JWT_SECRET}
       SENTRY_ENABLED: ${SENTRY_ENABLED}
       SENTRY_DSN: ${SENTRY_DSN}

diff --git a/packages/api/scripts/init.sql b/packages/api/scripts/init.sql
@@ -1068,8 +1068,10 @@ CREATE TABLE projects_pull_frequency
  created_at                 timestamp with time zone NOT NULL DEFAULT NOW(),
  modified_at                timestamp with time zone NOT NULL DEFAULT NOW(),
  id_project                 uuid NOT NULL,
-CONSTRAINT PK_projects_pull_frequency PRIMARY KEY ( id_projects_pull_frequency ),
-CONSTRAINT FK_projects_pull_frequency_project FOREIGN KEY ( id_project ) REFERENCES projects ( id_project )
+ CONSTRAINT PK_projects_pull_frequency PRIMARY KEY ( id_projects_pull_frequency ),
+ CONSTRAINT FK_projects_pull_frequency_project FOREIGN KEY ( id_project ) REFERENCES projects ( id_project ),
+ CONSTRAINT UQ_projects_pull_frequency_project UNIQUE ( id_project )
+
 );