From 811d7b14b89518c5f1e52cb94575851fb06015ea Mon Sep 17 00:00:00 2001
From: supphakitd <67319010028@technictrang.ac.th>
Date: Sun, 23 Nov 2025 12:53:38 +0700
Subject: [PATCH 1/3] Dockerfile: fix path for nginx.conf

Signed-off-by: supphakitd <67319010028@technictrang.ac.th>
---
 Dockerfile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 0745e9e..635ae02 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,10 @@
 FROM nginx:alpine
 
-ADD nginx.conf /etc/nginx/nginx.conf
+RUN rm /etc/nginx/conf.d/default.conf
+
+COPY nginx.conf /etc/nginx/conf.d/default.conf
+
 ADD accounting-ng-nuttakit/dist/accounting-ng-nuttakit/browser /usr/share/nginx/html
+
+EXPOSE 80
+CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file

From 19a5245536d524fac6c8f2200863239157994e7c Mon Sep 17 00:00:00 2001
From: supphakitd <67319010028@technictrang.ac.th>
Date: Sun, 23 Nov 2025 13:19:53 +0700
Subject: [PATCH 2/3] 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 657e11a..d74b288 100644
--- a/.gitea/workflows/build-image.yml
+++ b/.gitea/workflows/build-image.yml
@@ -26,6 +26,10 @@ jobs:
           ng build
       - name: Build docker image
         run: |
+          set +e
+          docker rm $(docker stop $(docker ps -a -q --filter ancestor=accounting-api:latest --format="{{.ID}}"))
+          set -e
+          docker image rm -f accounting-frontend:latest
           docker build . -t accounting-frontend:latest
           
           
\ No newline at end of file

From f68f76373c5e528a3bed592d9d486b14f5baf6ac Mon Sep 17 00:00:00 2001
From: supphakitd <67319010028@technictrang.ac.th>
Date: Sun, 23 Nov 2025 13:22:04 +0700
Subject: [PATCH 3/3] workflow: fix typo on docker rm

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 d74b288..e5d99cd 100644
--- a/.gitea/workflows/build-image.yml
+++ b/.gitea/workflows/build-image.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Build docker image
         run: |
           set +e
-          docker rm $(docker stop $(docker ps -a -q --filter ancestor=accounting-api:latest --format="{{.ID}}"))
+          docker rm $(docker stop $(docker ps -a -q --filter ancestor=accounting-frontend:latest --format="{{.ID}}"))
           set -e
           docker image rm -f accounting-frontend:latest
           docker build . -t accounting-frontend:latest