From 5b1586ccd4c5c42d37d58c5b73667df52694454f Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Mon, 16 Dec 2024 23:17:18 +0700 Subject: [PATCH 1/4] updated name sys --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 05b99c6..3be602b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# HRMS SSO +# HRMS SSO & Landing Page ## Project setup From 9fa43ce12da839226996df6a45e1f1129873d89b Mon Sep 17 00:00:00 2001 From: Suchin Sapphasitthatha Date: Mon, 16 Dec 2024 16:27:11 +0000 Subject: [PATCH 2/4] add CI --- .onedev-buildspec.yml | 102 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 .onedev-buildspec.yml diff --git a/.onedev-buildspec.yml b/.onedev-buildspec.yml new file mode 100644 index 0000000..a9e216c --- /dev/null +++ b/.onedev-buildspec.yml @@ -0,0 +1,102 @@ +version: 37 +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-landing:@build_version@ hrms-git.chin.in.th/bma-hrms/hrms-landing: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-landing:@build_version@ hrms-git.bangkok.go.th/bma-hrms/hrms-landing:latest + condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL + triggers: + - !TagCreateTrigger + tags: prod-* + branches: main + retryCondition: never + maxRetries: 3 + retryDelay: 30 + timeout: 14400 From 159c56da8b483a36b9a93267e75a96b49e0b26d7 Mon Sep 17 00:00:00 2001 From: Suchin Sapphasitthatha Date: Mon, 16 Dec 2024 23:51:10 +0700 Subject: [PATCH 3/4] fix dockerfile --- docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index cfa0071..5701d96 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 @@ -16,4 +16,4 @@ COPY docker/nginx.conf /etc/nginx/nginx.conf COPY docker/entrypoint.sh /usr/local/bin/entrypoint.sh RUN chmod u+x /usr/local/bin/entrypoint.sh ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] -CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file +CMD ["nginx", "-g", "daemon off;"] From 8408edde9f235a0227f09087d747e0bd4b6091a9 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Tue, 17 Dec 2024 10:54:04 +0700 Subject: [PATCH 4/4] updated config name --- src/views/home.vue | 2 +- src/views/sso.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/home.vue b/src/views/home.vue index b758a67..30d3652 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -98,7 +98,7 @@ onMounted(async () => { if (!checkToken && !token.value) { await axios .post( - `${import.meta.env.VITE_SSO_URL}/kcauth`, + `${import.meta.env.VITE_URL_SSO}/kcauth`, {}, { headers: { diff --git a/src/views/sso.vue b/src/views/sso.vue index 00d99df..430da4f 100644 --- a/src/views/sso.vue +++ b/src/views/sso.vue @@ -28,7 +28,7 @@ async function onSubmit() { await axios .post( - `${import.meta.env.VITE_SSO_URL}/signin`, + `${import.meta.env.VITE_URL_SSO}/signin`, { username: username.value, password: password.value,