From 6a560abd3d38875fe37daabf87ecf27bab215927 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Wed, 6 Sep 2023 22:32:44 +0800
Subject: [PATCH] fix: dev and prod

---
 docker/Dockerfile                                    | 12 ++++++++++++
 .../default.conf => default_development.conf}        |  0
 .../default.conf => default_production.conf}         |  0
 docker/development/Dockerfile                        | 10 ----------
 docker/docker-compose.yaml                           |  4 ++--
 docker/production/Dockerfile                         | 10 ----------
 6 files changed, 14 insertions(+), 22 deletions(-)
 create mode 100644 docker/Dockerfile
 rename docker/{development/default.conf => default_development.conf} (100%)
 rename docker/{production/default.conf => default_production.conf} (100%)
 delete mode 100644 docker/development/Dockerfile
 delete mode 100644 docker/production/Dockerfile

diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 0000000..14445b4
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,12 @@
+FROM nginx
+
+COPY ./dist /data
+COPY ./secret /secret
+
+RUN rm /etc/nginx/conf.d/default.conf
+
+ARG ENV_VAR=default_production.conf
+
+ADD ${ENV_VAR} /etc/nginx/conf.d/
+
+RUN /bin/bash -c 'echo init ok'
diff --git a/docker/development/default.conf b/docker/default_development.conf
similarity index 100%
rename from docker/development/default.conf
rename to docker/default_development.conf
diff --git a/docker/production/default.conf b/docker/default_production.conf
similarity index 100%
rename from docker/production/default.conf
rename to docker/default_production.conf
diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile
deleted file mode 100644
index 85c7bcc..0000000
--- a/docker/development/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM nginx
-
-COPY ../dist /data
-COPY ../secret /secret
-
-RUN rm /etc/nginx/conf.d/default.conf
-
-ADD default.conf /etc/nginx/conf.d/
-
-RUN /bin/bash -c 'echo init ok'
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index bd6c76f..070ef43 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -6,7 +6,7 @@ version: '3'
 services:
   kicc-ui-dev:
     build:
-      context: ./development
+      context: .
     restart: always
     container_name: kicc-ui-dev
     image: kicc-ui-dev
@@ -17,7 +17,7 @@ services:
       - 443:443
   kicc-ui-prod:
     build:
-      context: ./production
+      context: .
     restart: always
     container_name: kicc-ui-prod
     image: kicc-ui-prod
diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile
deleted file mode 100644
index 85c7bcc..0000000
--- a/docker/production/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM nginx
-
-COPY ../dist /data
-COPY ../secret /secret
-
-RUN rm /etc/nginx/conf.d/default.conf
-
-ADD default.conf /etc/nginx/conf.d/
-
-RUN /bin/bash -c 'echo init ok'