From 3a79799cedc9a81d619ff592a904844413c4cba9 Mon Sep 17 00:00:00 2001
From: Pascal Delange <pascal@checkmarble.com>
Date: Fri, 8 Mar 2024 14:35:00 +0100
Subject: [PATCH] PR comments + add curl to image

add file
---
 .github/workflows/build_and_deploy.yaml       |  1 +
 Dockerfile                                    |  1 +
 Dockerfile_local                              | 22 +++++++++++++++++++
 packages/app-builder/.env.example             |  2 +-
 packages/app-builder/src/utils/environment.ts |  6 +----
 5 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 Dockerfile_local

diff --git a/.github/workflows/build_and_deploy.yaml b/.github/workflows/build_and_deploy.yaml
index c4324de4a..0e90aff5e 100644
--- a/.github/workflows/build_and_deploy.yaml
+++ b/.github/workflows/build_and_deploy.yaml
@@ -63,6 +63,7 @@ jobs:
           push: true
           target: app-builder
           tags: ${{ env.IMAGE }}
+          file: ./Dockerfile
           build-args: |
             "SENTRY_RELEASE=${{ env.SENTRY_RELEASE }}"
           secrets: |
diff --git a/Dockerfile b/Dockerfile
index 3f146b631..e67b03957 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,6 +23,7 @@ RUN pnpm deploy --filter=app-builder --prod /prod/app-builder
 FROM base AS app-builder
 ENV NODE_ENV=production
 ENV PORT=8080
+RUN apt-get update && apt-get install -y curl
 COPY --from=build /prod/app-builder /prod/app-builder
 WORKDIR /prod/app-builder
 EXPOSE 8080
diff --git a/Dockerfile_local b/Dockerfile_local
new file mode 100644
index 000000000..d45b3852e
--- /dev/null
+++ b/Dockerfile_local
@@ -0,0 +1,22 @@
+FROM node:20-slim AS base
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+RUN corepack enable
+
+FROM base AS build
+RUN apt-get update
+RUN apt-get -y install ca-certificates
+COPY . /usr/src/app
+WORKDIR /usr/src/app
+RUN pnpm install --frozen-lockfile
+RUN pnpm --filter=app-builder run build
+RUN pnpm deploy --filter=app-builder --prod /prod/app-builder
+
+FROM base AS app-builder
+ENV NODE_ENV=production
+ENV PORT=8080
+RUN apt-get update && apt-get install -y curl
+COPY --from=build /prod/app-builder /prod/app-builder
+WORKDIR /prod/app-builder
+EXPOSE 8080
+CMD [ "pnpm", "start"]
diff --git a/packages/app-builder/.env.example b/packages/app-builder/.env.example
index ee94908e5..a8e9180ee 100644
--- a/packages/app-builder/.env.example
+++ b/packages/app-builder/.env.example
@@ -15,7 +15,7 @@ MARBLE_API_DOMAIN_SERVER=http://localhost:8080
 MARBLE_APP_DOMAIN=http://localhost:3000
 
 # coment out to use the real firebase
-FIREBASE_AUTH_EMULATOR_HOST=http://localhost:9099
+FIREBASE_AUTH_EMULATOR_HOST=localhost:9099
 
 # if you make use of the auth emulator, you can enter dummy values
 FIREBASE_API_KEY=dummy
diff --git a/packages/app-builder/src/utils/environment.ts b/packages/app-builder/src/utils/environment.ts
index 994e11ce4..7d4ee023c 100644
--- a/packages/app-builder/src/utils/environment.ts
+++ b/packages/app-builder/src/utils/environment.ts
@@ -107,11 +107,7 @@ export function getServerEnv<K extends keyof ServerEnvVarName>(
 export function getClientEnvVars() {
   return {
     ENV: getServerEnv('ENV'),
-    FIREBASE_AUTH_EMULATOR_HOST: getServerEnv(
-      'FIREBASE_AUTH_EMULATOR_HOST',
-    )?.startsWith('http://')
-      ? getServerEnv('FIREBASE_AUTH_EMULATOR_HOST')
-      : 'http://' + getServerEnv('FIREBASE_AUTH_EMULATOR_HOST'),
+    FIREBASE_AUTH_EMULATOR_HOST: getServerEnv('FIREBASE_AUTH_EMULATOR_HOST'),
     FIREBASE_OPTIONS: {
       apiKey: getServerEnv('FIREBASE_API_KEY'),
       authDomain: getServerEnv('FIREBASE_AUTH_DOMAIN'),