From ef05bade9b1c1ec124a4d07f849cd456b6b4a168 Mon Sep 17 00:00:00 2001
From: Rachid F <rf@artesi.xyz>
Date: Wed, 20 Dec 2023 01:15:25 +0100
Subject: [PATCH] docker compose update

---
 docker-compose.yml      |  2 ++
 packages/api/Dockerfile | 12 ------------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 98541803b..1affbc85c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,6 +35,7 @@ services:
         DISTRIBUTION: ${DISTRIBUTION}
         JWT_SECRET: ${JWT_SECRET}
         REDIS_HOST: redis
+        ENCRYPT_CRYPTO_SECRET_KEY: ${ENCRYPT_CRYPTO_SECRET_KEY}
         HUBSPOT_CLIENT_ID: ${HUBSPOT_CLIENT_ID}
         HUBSPOT_CLIENT_SECRET: ${HUBSPOT_CLIENT_SECRET}
         ZOHOCRM_CLIENT_ID: ${ZOHOCRM_CLIENT_ID}
@@ -43,6 +44,7 @@ services:
         PIPEDRIVE_CLIENT_SECRET: ${PIPEDRIVE_CLIENT_SECRET}
         ZENDESK_CLIENT_ID: ${ZENDESK_CLIENT_ID}
         ZENDESK_CLIENT_SECRET: ${ZENDESK_CLIENT_SECRET}
+        OAUTH_REDIRECT_BASE: ${OAUTH_REDIRECT_BASE}
 
 
     restart:
diff --git a/packages/api/Dockerfile b/packages/api/Dockerfile
index f28bdc18e..b4a7a50f0 100644
--- a/packages/api/Dockerfile
+++ b/packages/api/Dockerfile
@@ -47,18 +47,6 @@ WORKDIR /app
 
 COPY --from=installer ./app .
 
-
-
-ENV HUBSPOT_CLIENT_ID="$HUBSPOT_CLIENT_ID"
-ENV HUBSPOT_CLIENT_SECRET="$HUBSPOT_CLIENT_SECRET"
-ENV ZOHOCRM_CLIENT_ID="$ZOHOCRM_CLIENT_ID"
-ENV ZOHOCRM_CLIENT_SECRET="$ZOHOCRM_CLIENT_SECRET"
-ENV PIPEDRIVE_CLIENT_ID="$PIPEDRIVE_CLIENT_ID"
-ENV PIPEDRIVE_CLIENT_SECRET="$PIPEDRIVE_CLIENT_SECRET"
-ENV ZENDESK_CLIENT_ID="$ZENDESK_CLIENT_ID"
-ENV ZENDESK_CLIENT_SECRET="$ZENDESK_CLIENT_SECRET"
-ENV OAUTH_REDIRECT_BASE="$OAUTH_REDIRECT_BASE"
-
 # Launching the backend 
 # Maintain the root api folder as context (Breaking)
 CMD cd /app/packages/api && node dist/src/main.js
\ No newline at end of file