PPOB/ppob-frontend
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'main'

Browse Source 
Develop

See merge request empatnusabangsa/ppob/ppob-frontend!108
This commit is contained in:
ilham dwi pratama 2022-01-29 02:23:52 +00:00
commit 31594df36f
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -6,6 +6,8 @@ variables:
DOCKER_HOST: tcp://docker:2375 DOCKER_HOST: tcp://docker:2375
DOCKER_TLS_CERTDIR: "" DOCKER_TLS_CERTDIR: ""
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
APP_BASE_URL: https://api.wndsolutions.id/v1
STAGING_BASE_URL: https://ppob-backend.k3s.bangun-kreatif.com/v1
stages: stages:
- build-staging - build-staging
@ -22,7 +24,7 @@ build-staging:
- docker:dind - docker:dind
script: script:
- docker login $REGISTRY_URL -u $BKA_REGISTRY_USER -p $BKA_REGISTRY_PASS - 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 push $REGISTRY_IMAGE:$VERSION_STAGING
- docker rmi $REGISTRY_IMAGE:$VERSION_STAGING - docker rmi $REGISTRY_IMAGE:$VERSION_STAGING
@ -49,7 +51,7 @@ build-production:
- docker:dind - docker:dind
script: script:
- docker login $REGISTRY_URL -u $BKA_REGISTRY_USER -p $BKA_REGISTRY_PASS - 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 push $REGISTRY_IMAGE:$VERSION_PRODUCTION
- docker rmi $REGISTRY_IMAGE:$VERSION_PRODUCTION - docker rmi $REGISTRY_IMAGE:$VERSION_PRODUCTION

2
Dockerfile
View File

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

2
src/config/app.js
View File

@ -1,3 +1,3 @@
export const appConfig = { 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'
}; };