From 2dee76e1c721cc9695080acbd9ded8b66a0d012d Mon Sep 17 00:00:00 2001 From: supphakitd <67319010028@technictrang.ac.th> Date: Fri, 21 Nov 2025 15:52:47 +0700 Subject: [PATCH 1/8] entrypoint: added start api services scripts Signed-off-by: supphakitd <67319010028@technictrang.ac.th> --- Dockerfile | 3 +++ entrypoint | 7 ++----- start-accountingwep.sh | 3 +++ start-login.sh | 3 +++ 4 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 start-accountingwep.sh create mode 100644 start-login.sh diff --git a/Dockerfile b/Dockerfile index f1492da..d8620c7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,4 +14,7 @@ ADD package.json /server/package.json ADD exthernal-login-api /server/exthernal-login-api ADD exthernal-ttc-api /server/exthernal-ttc-api +ADD start-accountingwep.sh /server/start-accountingwep.sh +ADD start-login.sh /server/start-login.sh + ENTRYPOINT ["/entrypoint"] diff --git a/entrypoint b/entrypoint index eac4d14..cac8672 100644 --- a/entrypoint +++ b/entrypoint @@ -1,6 +1,3 @@ #!/bin/sh -cd /server/exthernal-login-api -& npm start - -cd /server/exthernal-accountingwep-api -& npm start \ No newline at end of file +./start-login.sh & +exec ./start-accountingwep.sh \ No newline at end of file diff --git a/start-accountingwep.sh b/start-accountingwep.sh new file mode 100644 index 0000000..f009920 --- /dev/null +++ b/start-accountingwep.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cd /server/exthernal-accountingwep-api +npm start \ No newline at end of file diff --git a/start-login.sh b/start-login.sh new file mode 100644 index 0000000..57c2836 --- /dev/null +++ b/start-login.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cd /server/exthernal-login-api +npm start \ No newline at end of file From 7584e0fb8e1bcb7370f4829b30784e5552f731c7 Mon Sep 17 00:00:00 2001 From: supphakitd <67319010028@technictrang.ac.th> Date: Fri, 21 Nov 2025 17:17:17 +0700 Subject: [PATCH 2/8] Docker: fix path for scripts Signed-off-by: supphakitd <67319010028@technictrang.ac.th> --- Dockerfile | 7 +++++-- entrypoint | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index d8620c7..8c56e60 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,10 @@ ADD package.json /server/package.json ADD exthernal-login-api /server/exthernal-login-api ADD exthernal-ttc-api /server/exthernal-ttc-api -ADD start-accountingwep.sh /server/start-accountingwep.sh -ADD start-login.sh /server/start-login.sh +ADD start-accountingwep.sh /start-accountingwep.sh +ADD start-login.sh /start-login.sh + +RUN chmod +x /start-accountingwep.sh +RUN chmod +x /start-login.sh ENTRYPOINT ["/entrypoint"] diff --git a/entrypoint b/entrypoint index cac8672..93cc608 100644 --- a/entrypoint +++ b/entrypoint @@ -1,3 +1,3 @@ #!/bin/sh -./start-login.sh & +./start-login.sh & exec ./start-accountingwep.sh \ No newline at end of file From 4a548e38b5b4e92b4beb78c16aa69844766b85bf Mon Sep 17 00:00:00 2001 From: supphakitd <67319010028@technictrang.ac.th> Date: Fri, 21 Nov 2025 17:33:25 +0700 Subject: [PATCH 3/8] Dockerfile: forgot to add ttc, also add accountingwep api Signed-off-by: supphakitd <67319010028@technictrang.ac.th> --- Dockerfile | 3 +++ entrypoint | 1 + start-ttc.sh | 3 +++ 3 files changed, 7 insertions(+) create mode 100644 start-ttc.sh diff --git a/Dockerfile b/Dockerfile index 8c56e60..3a4ea75 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,11 +13,14 @@ ADD package.json /server/package.json ADD exthernal-login-api /server/exthernal-login-api ADD exthernal-ttc-api /server/exthernal-ttc-api +ADD exthernal-accountingwep-api /server/exthernal-accountingwep-api ADD start-accountingwep.sh /start-accountingwep.sh +ADD start-ttc.sh /start-ttc.sh ADD start-login.sh /start-login.sh RUN chmod +x /start-accountingwep.sh RUN chmod +x /start-login.sh +RUN chmod +x /start-ttc.sh ENTRYPOINT ["/entrypoint"] diff --git a/entrypoint b/entrypoint index 93cc608..c5bc900 100644 --- a/entrypoint +++ b/entrypoint @@ -1,3 +1,4 @@ #!/bin/sh ./start-login.sh & +./start-ttc.sh & exec ./start-accountingwep.sh \ No newline at end of file diff --git a/start-ttc.sh b/start-ttc.sh new file mode 100644 index 0000000..daf3de5 --- /dev/null +++ b/start-ttc.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cd /server/exthernal-ttc-api +npm start \ No newline at end of file From 40383733cdf0c9eea040cbdda8661ac41c5f89a2 Mon Sep 17 00:00:00 2001 From: supphakitd <67319010028@technictrang.ac.th> Date: Fri, 21 Nov 2025 17:45:37 +0700 Subject: [PATCH 4/8] Dockerfile: just add the entire repo Signed-off-by: supphakitd <67319010028@technictrang.ac.th> --- .gitea/workflows/build-image.yml | 10 +++------- Dockerfile | 18 ++++++------------ 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/.gitea/workflows/build-image.yml b/.gitea/workflows/build-image.yml index 1a438d3..644b643 100644 --- a/.gitea/workflows/build-image.yml +++ b/.gitea/workflows/build-image.yml @@ -13,15 +13,11 @@ jobs: # change mirror to kku.ac.th for faster package downloading sudo sed -i 's@http://archive.ubuntu.com@http://mirror.kku.ac.th@g' /etc/apt/sources.list.d/ubuntu.sources sudo apt update && sudo apt install nodejs npm curl -y - - name: Install project dependencies - run: | - npm install - - name: Testing APIs - run: | - chmod +x test.sh - ./test.sh - name: Build docker image run: | + mv Dockerfile ../ + mv entrypoint ../ + cd ../ docker build . -t accounting-api:latest \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 3a4ea75..6d565d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,22 +5,16 @@ RUN chmod +x ./entrypoint RUN apk update && apk add npm -RUN mkdir /server +ADD micro-service-api /server -ADD node_modules /server/node_modules -ADD package-lock.json /server/package-lock.json -ADD package.json /server/package.json - -ADD exthernal-login-api /server/exthernal-login-api -ADD exthernal-ttc-api /server/exthernal-ttc-api -ADD exthernal-accountingwep-api /server/exthernal-accountingwep-api - -ADD start-accountingwep.sh /start-accountingwep.sh -ADD start-ttc.sh /start-ttc.sh -ADD start-login.sh /start-login.sh +RUN mv /server/start-accountingwep.sh / +RUN mv /server/start-login.sh / +RUN mv /server/start-ttc.sh / RUN chmod +x /start-accountingwep.sh RUN chmod +x /start-login.sh RUN chmod +x /start-ttc.sh +RUN cd /server && npm install + ENTRYPOINT ["/entrypoint"] From 712e17ece8fbe54b6dcbe4a9ac7e7a2d55e7f58e Mon Sep 17 00:00:00 2001 From: supphakitd <67319010028@technictrang.ac.th> Date: Fri, 21 Nov 2025 18:40:57 +0700 Subject: [PATCH 5/8] routes/route.js: case-sensitive Signed-off-by: supphakitd <67319010028@technictrang.ac.th> --- exthernal-accountingwep-api/src/routes/route.js | 2 +- exthernal-ttc-api/src/routes/route.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exthernal-accountingwep-api/src/routes/route.js b/exthernal-accountingwep-api/src/routes/route.js index bf6eee9..18c4ced 100644 --- a/exthernal-accountingwep-api/src/routes/route.js +++ b/exthernal-accountingwep-api/src/routes/route.js @@ -3,7 +3,7 @@ import { accountingSetup } from '../controllers/accountingSetupController.js' import { accountingSearch } from '../controllers/accountingSearchController.js' import { accountingSum } from '../controllers/accountingSumController.js' import { accountingAdd } from '../controllers/accountingAddController.js' -import { reportController } from '../controllers/ReportController.js' +import { reportController } from '../controllers/reportController.js' // import { authMiddleware } from '../middlewares/auth.js' // import { sendResponse } from '../utils/response.js' diff --git a/exthernal-ttc-api/src/routes/route.js b/exthernal-ttc-api/src/routes/route.js index 68e4b3e..319c69a 100644 --- a/exthernal-ttc-api/src/routes/route.js +++ b/exthernal-ttc-api/src/routes/route.js @@ -5,7 +5,7 @@ import { budgetAdd } from '../controllers/budgetAddController.js' import { projectSearch } from '../controllers/projectSearchController.js' import { projectAdd } from '../controllers/projectAddController.js' import { budgetExpense } from '../controllers/budgetExpenseController.js' -import { reportController } from '../controllers/ReportController.js' +import { reportController } from '../controllers/reportController.js' import { transactionSearch } from '../controllers/transactionSearchController.js' // import { authMiddleware } from '../middlewares/auth.js' From 4b295707573ce096d8e0efb156777f3059b4aac8 Mon Sep 17 00:00:00 2001 From: supphakitd <67319010028@technictrang.ac.th> Date: Fri, 21 Nov 2025 19:33:53 +0700 Subject: [PATCH 6/8] .env: fix host Signed-off-by: supphakitd <67319010028@technictrang.ac.th> --- exthernal-accountingwep-api/.env | 4 ++-- exthernal-login-api/.env | 4 ++-- exthernal-ttc-api/.env | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/exthernal-accountingwep-api/.env b/exthernal-accountingwep-api/.env index f4c11cd..0402cc7 100644 --- a/exthernal-accountingwep-api/.env +++ b/exthernal-accountingwep-api/.env @@ -2,7 +2,7 @@ PJ_NAME=exthernal-wepaccounting-api # database -PG_HOST=10.9.0.0 +PG_HOST=accounting-database PG_USER=postgres PG_PASS=ttc@2026 PG_DB=ttc @@ -13,7 +13,7 @@ SMTP_USER=lalisakuty@gmail.com SMTP_PASS=lurl pckw qugk tzob # REDIS -REDIS_HOST=10.9.0.0x +REDIS_HOST=redis REDIS_PORT=6379 OTP_TTL_SECONDS=300 diff --git a/exthernal-login-api/.env b/exthernal-login-api/.env index d5df980..484b174 100644 --- a/exthernal-login-api/.env +++ b/exthernal-login-api/.env @@ -2,7 +2,7 @@ PJ_NAME=exthernal-login-api # database -PG_HOST=10.9.0.0 +PG_HOST=accounting-database PG_USER=postgres PG_PASS=ttc@2026 PG_DB=ttc @@ -13,7 +13,7 @@ SMTP_USER=lalisakuty@gmail.com SMTP_PASS=lurl pckw qugk tzob # REDIS -REDIS_HOST=10.9.0.0 +REDIS_HOST=redis REDIS_PORT=6379 OTP_TTL_SECONDS=300 diff --git a/exthernal-ttc-api/.env b/exthernal-ttc-api/.env index c93c6dd..6c13bfe 100644 --- a/exthernal-ttc-api/.env +++ b/exthernal-ttc-api/.env @@ -2,7 +2,7 @@ PJ_NAME=exthernal-ttc-api # database -PG_HOST=10.9.0.0 +PG_HOST=accounting-database PG_USER=postgres PG_PASS=ttc@2026 PG_DB=ttc @@ -13,7 +13,7 @@ SMTP_USER=lalisakuty@gmail.com SMTP_PASS=lurl pckw qugk tzob # REDIS -REDIS_HOST=127.0.0.1 +REDIS_HOST=redis REDIS_PORT=6379 OTP_TTL_SECONDS=300 From 8fd3ada2f33f71505cc277cec3ff4927a95705ef Mon Sep 17 00:00:00 2001 From: supphakitd <67319010028@technictrang.ac.th> Date: Sun, 23 Nov 2025 13:20:19 +0700 Subject: [PATCH 7/8] Workflow: set +e-e to docker rm container Signed-off-by: supphakitd <67319010028@technictrang.ac.th> --- .gitea/workflows/build-image.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitea/workflows/build-image.yml b/.gitea/workflows/build-image.yml index 644b643..13b2b2c 100644 --- a/.gitea/workflows/build-image.yml +++ b/.gitea/workflows/build-image.yml @@ -18,6 +18,10 @@ jobs: mv Dockerfile ../ mv entrypoint ../ cd ../ + set +e + docker rm $(docker stop $(docker ps -a -q --filter ancestor=accounting-api:latest --format="{{.ID}}")) + set -e + docekr image rm -f accounting-api:latest docker build . -t accounting-api:latest \ No newline at end of file From aa0b17740ab1e448851d71b8f32332e0d854d026 Mon Sep 17 00:00:00 2001 From: supphakitd <67319010028@technictrang.ac.th> Date: Sun, 23 Nov 2025 13:34:36 +0700 Subject: [PATCH 8/8] workflow: fix typo on docker Signed-off-by: supphakitd <67319010028@technictrang.ac.th> --- .gitea/workflows/build-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-image.yml b/.gitea/workflows/build-image.yml index 13b2b2c..a847633 100644 --- a/.gitea/workflows/build-image.yml +++ b/.gitea/workflows/build-image.yml @@ -21,7 +21,7 @@ jobs: set +e docker rm $(docker stop $(docker ps -a -q --filter ancestor=accounting-api:latest --format="{{.ID}}")) set -e - docekr image rm -f accounting-api:latest + docker image rm -f accounting-api:latest docker build . -t accounting-api:latest \ No newline at end of file