From c15c9b4899aea44be99ca4748bd48f0c27b881fa Mon Sep 17 00:00:00 2001 From: Suchin Sapphasitthatha Date: Tue, 4 Feb 2025 07:58:46 +0000 Subject: [PATCH 1/3] edit @server@ for UAT and PROD --- .onedev-buildspec.yml | 202 +++++++++++++++++++++--------------------- 1 file changed, 101 insertions(+), 101 deletions(-) diff --git a/.onedev-buildspec.yml b/.onedev-buildspec.yml index e4cb2d2..9d9aae7 100644 --- a/.onedev-buildspec.yml +++ b/.onedev-buildspec.yml @@ -1,102 +1,102 @@ -version: 37 +version: 38 jobs: - - name: CI for UAT - steps: - - !CheckoutStep - name: checkout code - cloneCredential: !DefaultCredential {} - withLfs: false - withSubmodules: false - condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL - - !GenerateChecksumStep - name: generate package checksum - files: package-lock.json yarn.lock - targetFile: checksum - condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL - - !SetupCacheStep - name: set up npm cache - key: node_modules_@file:checksum@ - loadKeys: - - node_modules - paths: - - node_modules - uploadStrategy: UPLOAD_IF_NOT_HIT - condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL - - !SetBuildVersionStep - name: set build version - buildVersion: '@tag@' - condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL - - !CommandStep - name: build & test - runInContainer: true - image: node - interpreter: !DefaultInterpreter - commands: | - npm install - npm run build - useTTY: true - condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL - - !BuildImageStep - name: build docker image - dockerfile: ./docker/Dockerfile - output: !RegistryOutput - tags: hrms-git.chin.in.th/bma-hrms/hrms-checkin:@build_version@ hrms-git.chin.in.th/bma-hrms/hrms-checkin:latest - condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL - triggers: - - !TagCreateTrigger - tags: uat-* - branches: main - retryCondition: never - maxRetries: 3 - retryDelay: 30 - timeout: 14400 - - name: CI for PROD - steps: - - !CheckoutStep - name: checkout code - cloneCredential: !DefaultCredential {} - withLfs: false - withSubmodules: false - condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL - - !GenerateChecksumStep - name: generate package checksum - files: package-lock.json yarn.lock - targetFile: checksum - condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL - - !SetupCacheStep - name: set up npm cache - key: node_modules_@file:checksum@ - loadKeys: - - node_modules - paths: - - node_modules - uploadStrategy: UPLOAD_IF_NOT_HIT - condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL - - !SetBuildVersionStep - name: set build version - buildVersion: '@tag@' - condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL - - !CommandStep - name: build & test - runInContainer: true - image: node - interpreter: !DefaultInterpreter - commands: | - npm install - npm run build - useTTY: true - condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL - - !BuildImageStep - name: build docker image - dockerfile: ./docker/Dockerfile - output: !RegistryOutput - tags: hrms-git.bangkok.go.th/bma-hrms/hrms-checkin:@build_version@ hrms-git.bangkok.go.th/bma-hrms/hrms-checkin:latest - condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL - triggers: - - !TagCreateTrigger - tags: prod-* - branches: main - retryCondition: never - maxRetries: 3 - retryDelay: 30 - timeout: 14400 +- name: CI for UAT + steps: + - !CheckoutStep + name: checkout code + cloneCredential: !DefaultCredential {} + withLfs: false + withSubmodules: false + condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL + - !GenerateChecksumStep + name: generate package checksum + files: package-lock.json yarn.lock + targetFile: checksum + condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL + - !SetupCacheStep + name: set up npm cache + key: node_modules_@file:checksum@ + loadKeys: + - node_modules + paths: + - node_modules + uploadStrategy: UPLOAD_IF_NOT_HIT + condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL + - !SetBuildVersionStep + name: set build version + buildVersion: '@tag@' + condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL + - !CommandStep + name: build & test + runInContainer: true + image: node + interpreter: !DefaultInterpreter + commands: | + npm install + npm run build + useTTY: true + condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL + - !BuildImageStep + name: build docker image + dockerfile: ./docker/Dockerfile + output: !RegistryOutput + tags: '@server@/bma-hrms/hrms-checkin:@build_version@ @server@/bma-hrms/hrms-checkin:latest' + condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL + triggers: + - !TagCreateTrigger + tags: uat-* + branches: main + retryCondition: never + maxRetries: 3 + retryDelay: 30 + timeout: 14400 +- name: CI for PROD + steps: + - !CheckoutStep + name: checkout code + cloneCredential: !DefaultCredential {} + withLfs: false + withSubmodules: false + condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL + - !GenerateChecksumStep + name: generate package checksum + files: package-lock.json yarn.lock + targetFile: checksum + condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL + - !SetupCacheStep + name: set up npm cache + key: node_modules_@file:checksum@ + loadKeys: + - node_modules + paths: + - node_modules + uploadStrategy: UPLOAD_IF_NOT_HIT + condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL + - !SetBuildVersionStep + name: set build version + buildVersion: '@tag@' + condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL + - !CommandStep + name: build & test + runInContainer: true + image: node + interpreter: !DefaultInterpreter + commands: | + npm install + npm run build + useTTY: true + condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL + - !BuildImageStep + name: build docker image + dockerfile: ./docker/Dockerfile + output: !RegistryOutput + tags: '@server@/bma-hrms/hrms-checkin:@build_version@ @server@/bma-hrms/hrms-checkin:latest' + condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL + triggers: + - !TagCreateTrigger + tags: prod-* + branches: main + retryCondition: never + maxRetries: 3 + retryDelay: 30 + timeout: 14400 From 2ec0a833f26ce97024bc8f73219354fc7c9119c1 Mon Sep 17 00:00:00 2001 From: Suchin Sapphasitthatha Date: Tue, 4 Feb 2025 08:14:22 +0000 Subject: [PATCH 2/3] fix Dockerfile FromAsCasing --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index cfa0071..599e192 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,7 @@ # docker buildx build --platform=linux/amd64 -f docker/Dockerfile . -t hrms-git.chin.in.th/bma-hrms/hrms-checkin:0.1 # Build Stage -FROM node:20-alpine as build-stage +FROM node:20-alpine AS build-stage WORKDIR /app COPY package*.json ./ RUN npm install From 33757bc359a8b3a0bc412bbf678c79c954b55612 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Thu, 13 Feb 2025 15:34:46 +0700 Subject: [PATCH 3/3] fixing redirect --- .env.production | 3 ++- docker/entrypoint.sh | 1 + src/views/MainView.vue | 7 ++----- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.env.production b/.env.production index 64ae476..065bcc6 100644 --- a/.env.production +++ b/.env.production @@ -1,2 +1,3 @@ VITE_API_URI_CONFIG=VITE_API_URI_CONFIG -VITE_URL_SSO=VITE_URL_SSO \ No newline at end of file +VITE_URL_SSO=VITE_URL_SSO +VITE_URL_LANDING=VITE_URL_LANDING \ No newline at end of file diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index ea4c9ca..34dd4e2 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -10,6 +10,7 @@ do sed -i 's|VITE_API_URI_CONFIG|'${VITE_API_URI_CONFIG}'|g' $file sed -i 's|VITE_URL_SSO|'${VITE_URL_SSO}'|g' $file + sed -i 's|VITE_URL_LANDING|'${VITE_URL_LANDING}'|g' $file done diff --git a/src/views/MainView.vue b/src/views/MainView.vue index bbc733a..d252ed2 100644 --- a/src/views/MainView.vue +++ b/src/views/MainView.vue @@ -19,7 +19,7 @@ const $q = useQuasar() // landing page config url const configParam = { - landingPageUrl: import.meta.env.VITE_URL_SSO, + landingPageUrl: import.meta.env.VITE_URL_LANDING, } const fullName = ref('') //ชื่อผู้ใช้งาน @@ -141,10 +141,7 @@ function onLoad(index: number, done: Function) { } // landing page redirect -const landingPageUrl = ref(getLandingUrl()) -function getLandingUrl() { - return configParam.landingPageUrl -} +const landingPageUrl = ref(configParam.landingPageUrl) /** ฟังก์ชันเรียกข้อมูลผู้ใช่งาน*/ async function fetchKeycloakPosition() {