From 4199fce976ae185a67711987832ed76d17f59c4d Mon Sep 17 00:00:00 2001
From: Rotimi Best <best@classroomio.com>
Date: Fri, 20 Sep 2024 09:10:05 +0100
Subject: [PATCH] chore: i think the docker should now build

---
 apps/backend/src/utils/supabase.js | 14 +++++++++-----
 apps/dashboard/Dockerfile          | 15 ++++++++++-----
 docker-compose.yaml                |  7 +++++--
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/apps/backend/src/utils/supabase.js b/apps/backend/src/utils/supabase.js
index 577207b9..9133f889 100644
--- a/apps/backend/src/utils/supabase.js
+++ b/apps/backend/src/utils/supabase.js
@@ -9,14 +9,18 @@ const getSupabase = (config) => {
 
   config = {
     supabaseConfig: {
-      url: PUBLIC_SUPABASE_URL || '',
-      anonKey: PUBLIC_SUPABASE_ANON_KEY || ''
+      url: PUBLIC_SUPABASE_URL,
+      anonKey: PUBLIC_SUPABASE_ANON_KEY
     }
   };
 
-  supabase = createClient(config.supabaseConfig.url, config.supabaseConfig.anonKey, {
-    auth: { persistSession: false }
-  });
+  try {
+    supabase = createClient(config.supabaseConfig.url, config.supabaseConfig.anonKey, {
+      auth: { persistSession: false }
+    });
+  } catch (error) {
+    console.error('Error starting supabase', error)
+  }
 
   return supabase;
 };
diff --git a/apps/dashboard/Dockerfile b/apps/dashboard/Dockerfile
index af29dd08..10ede97d 100644
--- a/apps/dashboard/Dockerfile
+++ b/apps/dashboard/Dockerfile
@@ -1,3 +1,5 @@
+
+
 FROM node:18
 
 WORKDIR "/app"
@@ -7,14 +9,17 @@ RUN npm install -g pnpm
 COPY ./package.json ./
 COPY ./pnpm-lock.yaml ./
 
-RUN pnpm install --frozen-lockfile
+RUN pnpm i --frozen-lockfile
 
 COPY . /app/
 
-CMD [ "ls", "-la" ]
-CMD [ "cd", "apps/dashboard" ]
-CMD [ "pnpm", "build" ]
+WORKDIR "/app/apps/dashboard"
+
+RUN pnpm i  --frozen-lockfile
+RUN pnpm build
 
 EXPOSE 5000
 
-CMD [ "pnpm", "start" ]
+CMD ["ls", "-la"]
+CMD ["pnpm", "start"]
+# CMD [ "sh", "-c", "ls -la && cd apps/dashboard && pnpm build && pnpm start" ]
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 4f6550f5..85a3df5d 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -34,10 +34,13 @@ services:
   dashboard:
     build:
       dockerfile: ./apps/dashboard/Dockerfile
-      context: .
+      context: ./
+    volumes:
+      - .:/app
+      - /app/node_modules
+      - /app/apps/dashboard/node_modules
     # command: sh -c "npm install -g pnpm && rm -rf node_modules && yes | pnpm install --frozen-lockfile && cd apps/dashboard && pnpm build && pnpm start"
     environment:
-      - NODE_ENV=production
       - IS_SELFHOSTED=true
       # Supabase - Database
       - PUBLIC_SUPABASE_URL=${PUBLIC_SUPABASE_URL}