From 2e15b7603d3bbb315b2aaf0775d7a4bc4ec47ce2 Mon Sep 17 00:00:00 2001
From: mroxso <24775431+mroxso@users.noreply.github.com>
Date: Sun, 4 Aug 2024 21:17:57 +0200
Subject: [PATCH] make umami variables dynamic when building

---
 .github/workflows/cd.yml      | 3 +--
 .github/workflows/cd_beta.yml | 3 +--
 compose.yaml                  | 2 +-
 lumina/app/layout.tsx         | 4 ++--
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index c717669..f9a5442 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -85,6 +85,5 @@ jobs:
         ssh -o StrictHostKeyChecking=no ${{ env.MAIN_HOST_USERNAME }}@${{ env.MAIN_HOST }} '
           cd lumina &&
           git pull origin main &&
-          docker compose pull &&
-          docker compose up -d
+          docker compose up -d --build
         '
diff --git a/.github/workflows/cd_beta.yml b/.github/workflows/cd_beta.yml
index 8d6f9e3..c2298e8 100644
--- a/.github/workflows/cd_beta.yml
+++ b/.github/workflows/cd_beta.yml
@@ -84,6 +84,5 @@ jobs:
         ssh -o StrictHostKeyChecking=no ${{ env.BETA_HOST_USERNAME }}@${{ env.BETA_HOST }} '
           cd lumina &&
           git pull origin beta &&
-          docker compose pull &&
-          docker compose up -d
+          docker compose up -d --build
         '
diff --git a/compose.yaml b/compose.yaml
index b9fa6b6..2cf66fa 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -2,6 +2,6 @@ version: '3'
 services:
   lumina:
     build: .
-    image: ghcr.io/lumina-rocks/lumina:latest
+    # image: ghcr.io/lumina-rocks/lumina:latest
     ports:
       - "8080:3000"
\ No newline at end of file
diff --git a/lumina/app/layout.tsx b/lumina/app/layout.tsx
index f3f64bb..b7438eb 100644
--- a/lumina/app/layout.tsx
+++ b/lumina/app/layout.tsx
@@ -39,9 +39,9 @@ export default function RootLayout({
           <TopNavigation />
           <Toaster />
           <Script
-            src="https://umami.softwerk.cloud/script.js"
+            src={`${process.env.NEXT_PUBLIC_UMAMI_URL}/script.js`}
             strategy="afterInteractive"
-            data-website-id="d0495d49-1f04-4501-8711-3bdcb4f7f7bd"
+            data-website-id={process.env.NEXT_PUBLIC_UMAMI_WEBSITE_ID}
             defer
           />
           <div className="main-content pb-14">