fix: dev and prod

2 years ago · 6a560abd3d
6 changed files with 14 additions and 22 deletions
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@ -0,0 +1,12 @@
				@@ -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'
--- a/docker/default_development.conf
+++ b/docker/default_development.conf
--- a/docker/default_production.conf
+++ b/docker/default_production.conf
--- a/docker/development/Dockerfile
+++ b/docker/development/Dockerfile
@ -1,10 +0,0 @@
				@@ -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'
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@ -6,7 +6,7 @@ version: '3'
				@@ -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:
				@@ -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
--- a/docker/production/Dockerfile
+++ b/docker/production/Dockerfile
@ -1,10 +0,0 @@
				@@ -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'