From cf674f7cc6ba12547e050971427f4f717252d691 Mon Sep 17 00:00:00 2001
From: Chris Grimmett <chris@grimtech.net>
Date: Tue, 27 Feb 2024 10:49:43 -0800
Subject: [PATCH] use docker build args

---
 next.Dockerfile                    | 6 ++++++
 packages/next/app/lib/constants.ts | 2 +-
 packages/next/app/lib/streams.ts   | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/next.Dockerfile b/next.Dockerfile
index 9edb233..1698993 100644
--- a/next.Dockerfile
+++ b/next.Dockerfile
@@ -7,6 +7,12 @@ RUN corepack enable
 
 
 FROM deps AS build
+ARG NEXT_PUBLIC_SITE_URL=foo
+ARG NEXT_PUBLIC_STRAPI_URL=foo
+ARG NEXT_PUBLIC_UPPY_COMPANION_URL=foo
+ENV NEXT_PUBLIC_SITE_URL ${NEXT_PUBLIC_SITE_URL}
+ENV NEXT_PUBLIC_STRAPI_URL ${NEXT_PUBLIC_STRAPI_URL}
+ENV NEXT_PUBLIC_UPPY_COMPANION_URL ${NEXT_PUBLIC_UPPY_COMPANION_URL}
 WORKDIR /usr/src/app
 COPY . .
 ENV NEXT_TELEMETRY_DISABLED 1
diff --git a/packages/next/app/lib/constants.ts b/packages/next/app/lib/constants.ts
index be054f9..18f163b 100644
--- a/packages/next/app/lib/constants.ts
+++ b/packages/next/app/lib/constants.ts
@@ -2,7 +2,7 @@ if (!process.env.NEXT_PUBLIC_SITE_URL) throw new Error('NEXT_PUBLIC_SITE_URL was
 if (!process.env.NEXT_PUBLIC_STRAPI_URL) throw new Error('NEXT_PUBLIC_STRAPI_URL was missing in env');
 if (!process.env.NEXT_PUBLIC_UPPY_COMPANION_URL) throw new Error('NEXT_PUBLIC_UPPY_COMPANION_URL undefined in env');
 
-export const companionUrl = process.env.NEXT_PUBLIC_UPPY_COMPANION_URL
+export const companionUrl = ''+process.env.NEXT_PUBLIC_UPPY_COMPANION_URL
 export const siteUrl = ''+process.env.NEXT_PUBLIC_SITE_URL
 export const strapiUrl = ''+process.env.NEXT_PUBLIC_STRAPI_URL
 export const patreonSupporterBenefitId: string = '4760169'
diff --git a/packages/next/app/lib/streams.ts b/packages/next/app/lib/streams.ts
index 1a45abf..2598448 100644
--- a/packages/next/app/lib/streams.ts
+++ b/packages/next/app/lib/streams.ts
@@ -275,7 +275,7 @@ export async function getAllStreamsForVtuber(vtuberId: number, archiveStatuses =
             });
 
             console.log(`strapiUrl=${strapiUrl}`)
-            const response = await fetch(`${strapiUrl}/api/streams?${query}`, fetchStreamsOptions);
+            const response = await fetch(`${strapiUrl}/api/streams?${query}`, fetchStreamsOptions)
 
             if (response.status !== 200) {
                 // If the response status is not 200 (OK), consider it a network failure