Merge branch 'develop' into 'main'

Develop

See merge request empatnusabangsa/ppob/ppob-frontend!108

.gitlab-ci.yml

@@ -6,6 +6,8 @@ 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 +24,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_BASE_URL=$STAGING_BASE_URL
     - docker push $REGISTRY_IMAGE:$VERSION_STAGING
     - docker rmi $REGISTRY_IMAGE:$VERSION_STAGING
 
@@ -49,7 +51,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_BASE_URL=$APP_BASE_URL
     - docker push $REGISTRY_IMAGE:$VERSION_PRODUCTION
     - docker rmi $REGISTRY_IMAGE:$VERSION_PRODUCTION
 

Dockerfile

@@ -3,6 +3,8 @@ WORKDIR /usr/src/app
 COPY package.json yarn.lock ./
 RUN yarn
 COPY . ./
+ARG REACT_APP_BASE_URL
+ENV REACT_APP_BASE_URL $REACT_APP_BASE_URL
 RUN yarn build
 
 FROM nginx:stable-alpine

src/config/app.js

@@ -1,3 +1,3 @@
 export const appConfig = {
- apiUrl: process.env.NEXT_PUBLIC_BASE_URL || 'https://ppob-backend.k3s.bangun-kreatif.com/v1'
+ apiUrl: process.env.REACT_APP_BASE_URL || 'https://ppob-backend.k3s.bangun-kreatif.com/v1'
 };