From f638ca70f708bea8ce3c0c1773742f3a2192e4d4 Mon Sep 17 00:00:00 2001
From: "ajat91.sudrajat" <ajat91.sudrajat@gmail.com>
Date: Fri, 28 Jan 2022 15:18:09 +0700
Subject: [PATCH 1/3] Bug fixing

---
 .env              | 1 +
 src/config/app.js | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)
 create mode 100644 .env

diff --git a/.env b/.env
new file mode 100644
index 0000000..7f5bf96
--- /dev/null
+++ b/.env
@@ -0,0 +1 @@
+process.env.NEXT_PUBLIC_BASE_URL=https://ppob-backend.k3s.bangun-kreatif.com/v1
\ No newline at end of file
diff --git a/src/config/app.js b/src/config/app.js
index b6c3d6a..9736d44 100644
--- a/src/config/app.js
+++ b/src/config/app.js
@@ -1,7 +1,3 @@
 export const appConfig = {
- apiUrl: 'https://ppob-backend.k3s.bangun-kreatif.com/v1'
-    //apiUrl: 'http://localhost:3222/v1'
-    // apiUrl: 'http://localhost:3222/v1'
+ apiUrl: process.env.NEXT_PUBLIC_BASE_URL || 'https://ppob-backend.k3s.bangun-kreatif.com/v1'
 };
-
-//export default appConfig;

From c1680822df97ed1bdbdda043a1f0e0332e64c4b6 Mon Sep 17 00:00:00 2001
From: Rido Akbar Ibrahim <ridoakbar02@gmail.com>
Date: Fri, 28 Jan 2022 16:26:43 +0700
Subject: [PATCH 2/3] Pages Product

---
 .gitlab-ci.yml | 8 ++++++--
 Dockerfile     | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58567c8..dd33d89 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,6 +6,10 @@ variables:
   DOCKER_HOST: tcp://docker:2375
   DOCKER_TLS_CERTDIR: ""
   DOCKER_DRIVER: overlay2
+  APP_BASE_URL: https://api.wndsolutions.id/v1 
+  STAGING_BASE_URL: https://ppob-backend.k3s.bangun-kreatif.com/v1
+};
+
 
 stages:
   - build-staging
@@ -22,7 +26,7 @@ build-staging:
     - docker:dind
   script:
     - docker login $REGISTRY_URL -u $BKA_REGISTRY_USER -p $BKA_REGISTRY_PASS
-    - docker build -t $REGISTRY_IMAGE:$VERSION_STAGING .
+    - docker build -t $REGISTRY_IMAGE:$VERSION_STAGING . --build-arg REACT_APP_API_BASE_URL=$STAGING_BASE_URL
     - docker push $REGISTRY_IMAGE:$VERSION_STAGING
     - docker rmi $REGISTRY_IMAGE:$VERSION_STAGING
 
@@ -49,7 +53,7 @@ build-production:
     - docker:dind
   script:
     - docker login $REGISTRY_URL -u $BKA_REGISTRY_USER -p $BKA_REGISTRY_PASS
-    - docker build -t $REGISTRY_IMAGE:$VERSION_PRODUCTION .
+    - docker build -t $REGISTRY_IMAGE:$VERSION_PRODUCTION . --build-arg REACT_APP_API_BASE_URL=$APP_BASE_URL
     - docker push $REGISTRY_IMAGE:$VERSION_PRODUCTION
     - docker rmi $REGISTRY_IMAGE:$VERSION_PRODUCTION
 
diff --git a/Dockerfile b/Dockerfile
index 3d2cf54..159e811 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,8 @@ WORKDIR /usr/src/app
 COPY package.json yarn.lock ./
 RUN yarn
 COPY . ./
+ARG NEXT_PUBLIC_BASE_URL
+ENV REACT_APP_API_BASE_URL $NEXT_PUBLIC_BASE_URL
 RUN yarn build
 
 FROM nginx:stable-alpine

From b0512c2eb29aa10f0115b8319ccd868e6e4c4f97 Mon Sep 17 00:00:00 2001
From: Rido Akbar Ibrahim <ridoakbar02@gmail.com>
Date: Fri, 28 Jan 2022 09:31:07 +0000
Subject: [PATCH 3/3] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd33d89..fedcf74 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,8 +8,6 @@ variables:
   DOCKER_DRIVER: overlay2
   APP_BASE_URL: https://api.wndsolutions.id/v1 
   STAGING_BASE_URL: https://ppob-backend.k3s.bangun-kreatif.com/v1
-};
-
 
 stages:
   - build-staging