diff --git a/Dockerfile b/Dockerfile
index 91fd656..66f7d87 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,13 +6,26 @@
 # RUN npm run build
 
 # FROM nginx:stable-alpine as production-stage
-# COPY --from=build-stage /app/build /usr/share/nginx/html
+# COPY --from=build-stage /app/dist /usr/share/nginx/html
 # COPY --from=build-stage /app/nginx.conf /etc/nginx/nginx.conf
 # EXPOSE 32166
 # CMD ["nginx", "-g", "daemon off;"]
 
-FROM nginx:stable-alpine
-COPY /dist /usr/share/nginx/html
-COPY /nginx.conf /etc/nginx/nginx.conf
+# FROM nginx:stable-alpine
+# COPY /dist /usr/share/nginx/html
+# COPY /nginx.conf /etc/nginx/nginx.conf
+# EXPOSE 32166
+# CMD ["nginx", "-g", "daemon off;"]
+
+# Use official Node image as base image for building
+FROM node:latest AS builder
+WORKDIR /app
+COPY package*.json ./
+RUN npm install
+COPY . .
+RUN npm run build
+FROM nginx:latest
+COPY --from=builder /app/dist /usr/share/nginx/html
+COPY --from=builder /app/nginx.conf /etc/nginx/nginx.conf
 EXPOSE 32166
-CMD ["nginx", "-g", "daemon off;"]
+CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file