From 989b45dee8ce75e789c691948813672482bb730d Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Tue, 3 Dec 2024 10:15:03 +0700
Subject: [PATCH] updated config

---
 .env.example                          |  6 ------
 .env.production                       |  4 ----
 Dockerfile                            | 21 ---------------------
 docker/Dockerfile                     | 19 +++++++++++++++++++
 entrypoint.sh => docker/entrypoint.sh |  4 ----
 nginx.conf => docker/nginx.conf       |  0
 6 files changed, 19 insertions(+), 35 deletions(-)
 delete mode 100644 Dockerfile
 create mode 100644 docker/Dockerfile
 rename entrypoint.sh => docker/entrypoint.sh (71%)
 rename nginx.conf => docker/nginx.conf (100%)

diff --git a/.env.example b/.env.example
index c3e52044..7808f4e0 100644
--- a/.env.example
+++ b/.env.example
@@ -1,8 +1,2 @@
 VITE_API_URI_CONFIG: "https://app.your-domain.com/api/v1"
-
-VITE_URL_KEYCLOAK: "https://id.your-domain.com"
-VITE_REALM_KEYCLOAK: "realms-name"
-VITE_CLIENTID_KEYCLOAK: "client-id"
-VITE_CLIENTSECRET_KEYCLOAK: "your-client-secret"
-
 VITE_MANUAL_URL: "https://app-manual.your-domain.com"
\ No newline at end of file
diff --git a/.env.production b/.env.production
index 2af45fc8..afa876a1 100644
--- a/.env.production
+++ b/.env.production
@@ -1,9 +1,5 @@
-VITE_REALM_KEYCLOAK=VITE_REALM_KEYCLOAK
-VITE_CLIENTID_KEYCLOAK=VITE_CLIENTID_KEYCLOAK
-VITE_URL_KEYCLOAK=VITE_URL_KEYCLOAK
 VITE_API_PUBLISH_URL=VITE_API_PUBLISH_URL
 VITE_API_REPORT_URL=VITE_API_REPORT_URL
 VITE_API_URI_CONFIG=VITE_API_URI_CONFIG
-VITE_CLIENTSECRET_KEYCLOAK=VITE_CLIENTSECRET_KEYCLOAK
 VITE_MANUAL_URL=VITE_MANUAL_URL
 VITE_URL_SSO: VITE_URL_SSO
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 6f2553ea..00000000
--- a/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-# docker build . -t docker.frappet.com/demo/fe:latest
-FROM node:lts as build-stage
-WORKDIR /app
-COPY package*.json ./
-RUN npm install
-COPY ./ .
-
-RUN npm run build
-
-FROM nginx as production-stage
-
-RUN mkdir /app
-COPY --from=build-stage /app/dist /app
-COPY nginx.conf /etc/nginx/nginx.conf
-
-COPY 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;"]
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 00000000..8614584d
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,19 @@
+# docker buildx build --platform=linux/amd64 -f docker/Dockerfile . -t hrms-git.chin.in.th/bma-hrms/hrms-admin:0.1
+
+# Build Stage
+FROM node:lts-alpine AS build-stage
+WORKDIR /app
+COPY package*.json ./
+RUN npm install
+COPY ./ .
+RUN npm run build
+
+# Production Stage
+FROM nginx:stable-alpine AS production-stage
+RUN mkdir /app
+COPY --from=build-stage /app/dist /app
+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;"]
diff --git a/entrypoint.sh b/docker/entrypoint.sh
similarity index 71%
rename from entrypoint.sh
rename to docker/entrypoint.sh
index f71b0009..ff6c0d53 100644
--- a/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -8,13 +8,9 @@ for file in $ROOT_DIR/assets/app.*.js* $ROOT_DIR/js/app.*.js* $ROOT_DIR/assets/Q
 do
   echo "Processing $file ...";
 
-  sed -i 's|VITE_REALM_KEYCLOAK|'${VITE_REALM_KEYCLOAK}'|g' $file 
-  sed -i 's|VITE_CLIENTID_KEYCLOAK|'${VITE_CLIENTID_KEYCLOAK}'|g' $file 
-  sed -i 's|VITE_URL_KEYCLOAK|'${VITE_URL_KEYCLOAK}'|g' $file 
   sed -i 's|VITE_API_PUBLISH_URL|'${VITE_API_PUBLISH_URL}'|g' $file 
   sed -i 's|VITE_API_REPORT_URL|'${VITE_API_REPORT_URL}'|g' $file 
   sed -i 's|VITE_API_URI_CONFIG|'${VITE_API_URI_CONFIG}'|g' $file
-  sed -i 's|VITE_CLIENTSECRET_KEYCLOAK|'${VITE_CLIENTSECRET_KEYCLOAK}'|g' $file
   sed -i 's|VITE_MANUAL_URL|'${VITE_MANUAL_URL}'|g' $file
   sed -i 's|VITE_URL_SSO|'${VITE_URL_SSO}'|g' $file
 
diff --git a/nginx.conf b/docker/nginx.conf
similarity index 100%
rename from nginx.conf
rename to docker/nginx.conf