From c7af40e2e34cb74c3f9ee199ff4058201fd10e14 Mon Sep 17 00:00:00 2001
From: xingzi <fengyuexingzi@gmail.com>
Date: Thu, 11 Jan 2024 09:59:58 +0800
Subject: [PATCH] docker-compose nginx

---
 docker/docker-compose.yaml => docker-compose.yaml | 4 ++--
 docker/{frontend => }/Dockerfile                  | 0
 docker/{frontend => }/conf/conf.d/default.conf    | 0
 docker/{frontend => }/conf/nginx.conf             | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename docker/docker-compose.yaml => docker-compose.yaml (79%)
 rename docker/{frontend => }/Dockerfile (100%)
 rename docker/{frontend => }/conf/conf.d/default.conf (100%)
 rename docker/{frontend => }/conf/nginx.conf (100%)

diff --git a/docker/docker-compose.yaml b/docker-compose.yaml
similarity index 79%
rename from docker/docker-compose.yaml
rename to docker-compose.yaml
index df9f51c..d7e8b93 100644
--- a/docker/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -3,7 +3,7 @@ version: "3.6"
 services:
   frontend:
     build:
-      context: ./frontend
+      context: ./docker/frontend
       dockerfile: Dockerfile
     image: eladmin-frontend:latest
     container_name: eladmin-frontend
@@ -12,4 +12,4 @@ services:
       - "8282:80"
     volumes:
       # - ./frontend/conf/conf.d:/etc/nginx/conf.d/default.conf
-      - ../dist:/usr/share/nginx/html
+      - ./dist:/usr/share/nginx/html
diff --git a/docker/frontend/Dockerfile b/docker/Dockerfile
similarity index 100%
rename from docker/frontend/Dockerfile
rename to docker/Dockerfile
diff --git a/docker/frontend/conf/conf.d/default.conf b/docker/conf/conf.d/default.conf
similarity index 100%
rename from docker/frontend/conf/conf.d/default.conf
rename to docker/conf/conf.d/default.conf
diff --git a/docker/frontend/conf/nginx.conf b/docker/conf/nginx.conf
similarity index 100%
rename from docker/frontend/conf/nginx.conf
rename to docker/conf/nginx.conf