Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin

scripts/deploy/Dockerfile

@@ -18,12 +18,12 @@ RUN pnpm run build
 
 RUN echo "Builder Success 🎉"
 
-FROM nginx:stable-alpine as production
+FROM nginx:stable-alpine AS production
 
 RUN echo "types { application/javascript js mjs; }" > /etc/nginx/conf.d/mjs.conf
 COPY --from=builder /app/playground/dist /usr/share/nginx/html
 
-COPY ./nginx.conf /etc/nginx/nginx.conf
+COPY --from=builder /app/scripts/deploy/nginx.conf /etc/nginx/nginx.conf
 
 EXPOSE 8080
 

scripts/deploy/build-local-docker-image.sh

@@ -24,7 +24,7 @@ function install_dependencies() {
 
 function build_image() {
     # build docker
-    docker build . -f Dockerfile -t ${IMAGE_NAME} || ERROR="build_image failed"
+    docker build ../../ -f Dockerfile -t ${IMAGE_NAME} || ERROR="build_image failed"
 }
 
 function log_message() {