From 384339a0a660134768b1e553bf22e10adaa0711c Mon Sep 17 00:00:00 2001
From: teodorus-nathaniel <nathankurnia26@gmail.com>
Date: Thu, 21 Mar 2024 23:25:17 +0700
Subject: [PATCH] Fix env issue

---
 .github/workflows/build-deploy.yml | 4 ++--
 ci.env                             | 2 +-
 docker/Dockerfile                  | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml
index 829325a60..3acb76039 100644
--- a/.github/workflows/build-deploy.yml
+++ b/.github/workflows/build-deploy.yml
@@ -48,7 +48,6 @@ jobs:
           build-args: |
             GH_GA_ID=G-TP1XEFNHQD
             GH_APP_KIND=grill
-            GH_APP_ID=1
             GH_HCAPTCHA_SITE_KEY=${{ secrets.PROD_HCAPTCHA_SITE_KEY }}
             GH_AMP_ID=2eeca0e8a0163c89e3f023c971e426a6
             GH_OFFCHAIN_SIGNER_URL=https://signer.subsocial.network
@@ -58,6 +57,7 @@ jobs:
             GH_SERVER_MNEMONIC=${{ secrets.SERVER_MNEMONIC }}
             GH_NEXT_PUBLIC_DATAHUB_QUERY_URL=https://sub-data-hub.subsocial.network/graphql
             GH_NEXT_PUBLIC_DATAHUB_SUBSCRIPTION_URL=wss://sub-data-hub.subsocial.network/graphql-ws
+            GH_NEXT_PUBLIC_APP_ID=1
             GH_DATAHUB_QUEUE_URL=https://sub-queue-data-hub.subsocial.network/graphql
             GH_DATAHUB_QUEUE_TOKEN=${{ secrets.DATAHUB_QUEUE_TOKEN }}
             # GH_NEXT_PUBLIC_ENABLE_MAINTENANCE_PAGE=true
@@ -78,7 +78,6 @@ jobs:
           build-args: |
             GH_GA_ID=fake
             GH_APP_KIND=grill
-            GH_APP_ID=12364
             GH_HCAPTCHA_SITE_KEY=3beeddac-2dce-41cc-8e18-338118426c38
             GH_AMP_ID=71bf5a46800fedba5e9a01243b988164
             GH_OFFCHAIN_SIGNER_URL=https://signer.subsocial.network
@@ -88,6 +87,7 @@ jobs:
             GH_SERVER_MNEMONIC=plunge pumpkin penalty segment cattle more print below fat lemon clap uniform
             GH_NEXT_PUBLIC_DATAHUB_QUERY_URL=https://notifications-data-hub.subsocial.network/graphql
             GH_NEXT_PUBLIC_DATAHUB_SUBSCRIPTION_URL=wss://notifications-data-hub.subsocial.network/graphql-ws
+            GH_NEXT_PUBLIC_APP_ID=12364
             GH_DATAHUB_QUEUE_URL=https://notifications-queue-data-hub.subsocial.network/graphql
             GH_DATAHUB_QUEUE_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhZG1pbiI6dHJ1ZX0.jpXwkIJ4DpV4IvSI3eWVVXE6x89qr_GIq7IlbBv5YE0
             # GH_NEXT_PUBLIC_ENABLE_MAINTENANCE_PAGE=true
diff --git a/ci.env b/ci.env
index 45e92128f..6ff5bb1b2 100644
--- a/ci.env
+++ b/ci.env
@@ -3,7 +3,6 @@ NEXT_PUBLIC_APP_KIND=subsocial
 NEXT_PUBLIC_CONNECTION_KIND='$GH_CONNECTION_KIND'
 NEXT_PUBLIC_GA_ID='$GH_GA_ID'
 NEXT_PUBLIC_APP_KIND='$GH_APP_KIND'
-NEXT_PUBLIC_APP_ID='$GH_APP_ID'
 NEXT_PUBLIC_APP_BASE_URL='$GH_APP_BASE_URL'
 NEXT_PUBLIC_HCAPTCHA_SITE_KEY='$GH_HCAPTCHA_SITE_KEY'
 NEXT_PUBLIC_OFFCHAIN_SIGNER_URL='$GH_OFFCHAIN_SIGNER_URL'
@@ -12,6 +11,7 @@ SELLER_CLIENT_ID='$GH_SELLER_CLIENT_ID'
 SELLER_CLIENT_TOKEN_SIGNER='$GH_SELLER_TOKEN_SIGNER'
 NEXT_PUBLIC_DATAHUB_QUERY_URL='GH_NEXT_PUBLIC_DATAHUB_QUERY_URL'
 NEXT_PUBLIC_DATAHUB_SUBSCRIPTION_URL='GH_NEXT_PUBLIC_DATAHUB_SUBSCRIPTION_URL'
+NEXT_PUBLIC_APP_ID='$GH_NEXT_PUBLIC_APP_ID'
 DATAHUB_QUEUE_URL='GH_DATAHUB_QUEUE_URL'
 DATAHUB_QUEUE_TOKEN='GH_DATAHUB_QUEUE_TOKEN'
 SERVER_MNEMONIC='GH_SERVER_MNEMONIC'
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 55e11578a..609e0401f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -11,6 +11,7 @@ ARG GH_SELLER_CLIENT_ID
 ARG GH_SELLER_TOKEN_SIGNER
 ARG GH_NEXT_PUBLIC_DATAHUB_QUERY_URL
 ARG GH_NEXT_PUBLIC_DATAHUB_SUBSCRIPTION_URL
+ARG GH_NEXT_PUBLIC_APP_ID
 ARG GH_DATAHUB_QUEUE_URL
 ARG GH_DATAHUB_QUEUE_TOKEN
 ARG GH_SERVER_MNEMONIC
@@ -18,7 +19,6 @@ ARG GH_NEXT_PUBLIC_ENABLE_MAINTENANCE_PAGE
 
 ENV NEXT_PUBLIC_GA_ID=${GH_GA_ID} \
     NEXT_PUBLIC_APP_KIND=${GH_APP_KIND} \
-    NEXT_PUBLIC_APP_ID=${GH_APP_ID} \
     NEXT_PUBLIC_APP_BASE_URL=${GH_APP_BASE_URL} \
     NEXT_PUBLIC_HCAPTCHA_SITE_KEY=${GH_HCAPTCHA_SITE_KEY} \
     NEXT_PUBLIC_AMP_ID=${GH_AMP_ID} \
@@ -28,6 +28,7 @@ ENV NEXT_PUBLIC_GA_ID=${GH_GA_ID} \
     SELLER_CLIENT_TOKEN_SIGNER=${GH_SELLER_TOKEN_SIGNER} \
     NEXT_PUBLIC_DATAHUB_QUERY_URL=${GH_NEXT_PUBLIC_DATAHUB_QUERY_URL} \
     NEXT_PUBLIC_DATAHUB_SUBSCRIPTION_URL=${GH_NEXT_PUBLIC_DATAHUB_SUBSCRIPTION_URL} \
+    NEXT_PUBLIC_APP_ID=${GH_NEXT_PUBLIC_APP_ID} \
     DATAHUB_QUEUE_URL=${GH_DATAHUB_QUEUE_URL} \
     DATAHUB_QUEUE_TOKEN=${GH_DATAHUB_QUEUE_TOKEN} \
     SERVER_MNEMONIC=${GH_SERVER_MNEMONIC} \
@@ -57,6 +58,7 @@ ARG GH_SELLER_CLIENT_ID
 ARG GH_SELLER_TOKEN_SIGNER
 ARG GH_NEXT_PUBLIC_DATAHUB_QUERY_URL
 ARG GH_NEXT_PUBLIC_DATAHUB_SUBSCRIPTION_URL
+ARG GH_NEXT_PUBLIC_APP_ID
 ARG GH_DATAHUB_QUEUE_URL
 ARG GH_DATAHUB_QUEUE_TOKEN
 ARG GH_SERVER_MNEMONIC
@@ -73,6 +75,7 @@ ENV NEXT_PUBLIC_GA_ID=${GH_GA_ID}  \
     SELLER_CLIENT_TOKEN_SIGNER=${GH_SELLER_TOKEN_SIGNER} \
     NEXT_PUBLIC_DATAHUB_QUERY_URL=${GH_NEXT_PUBLIC_DATAHUB_QUERY_URL} \
     NEXT_PUBLIC_DATAHUB_SUBSCRIPTION_URL=${GH_NEXT_PUBLIC_DATAHUB_SUBSCRIPTION_URL} \
+    NEXT_PUBLIC_APP_ID=${GH_NEXT_PUBLIC_APP_ID} \
     DATAHUB_QUEUE_URL=${GH_DATAHUB_QUEUE_URL} \
     DATAHUB_QUEUE_TOKEN=${GH_DATAHUB_QUEUE_TOKEN} \
     SERVER_MNEMONIC=${GH_SERVER_MNEMONIC} \