From 6863b28f1b386e7b212d3b6fa8145f395982aa11 Mon Sep 17 00:00:00 2001
From: yixian <davepotter@163.com>
Date: Tue, 10 Mar 2020 11:18:07 +0800
Subject: [PATCH] feat(settle ui): ui dockerfile

---
 Dockerfile                               | 13 +++++++++++++
 docker/Dockerfile                        | 13 -------------
 {docker => uidocker}/conf.d/default.conf |  0
 {docker => uidocker}/upstream.conf.tpl   |  0
 4 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 Dockerfile
 delete mode 100644 docker/Dockerfile
 rename {docker => uidocker}/conf.d/default.conf (100%)
 rename {docker => uidocker}/upstream.conf.tpl (100%)

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..5cf50efdf
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,13 @@
+FROM nginx:alpine
+
+COPY uidocker/conf.d /etc/nginx/
+
+COPY src/main/ui /var/www/royalpay
+
+COPY uidocker/upstream.conf.tpl /opt/upstream.conf.tpl
+
+RUN apk add gettext
+
+EXPOSE 80
+
+CMD envsubst < /opt/upstream.conf.tpl > /etc/nginx/conf.d/upstream.conf && exec nginx -g 'daemon off;'
\ No newline at end of file
diff --git a/docker/Dockerfile b/docker/Dockerfile
deleted file mode 100644
index 003fa2a9f..000000000
--- a/docker/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM nginx:alpine
-
-COPY conf.d /etc/nginx/
-
-COPY ../src/main/ui /var/www/royalpay
-
-COPY upstream.conf.tpl /opt/upstream.conf.tpl
-
-RUN apk add gettext
-
-EXPOSE 80
-
-CMD envsubst < /opt/upstream.conf.tpl > /etc/nginx/conf.d/upstream.conf && exec nginx -g 'daemon off;'
\ No newline at end of file
diff --git a/docker/conf.d/default.conf b/uidocker/conf.d/default.conf
similarity index 100%
rename from docker/conf.d/default.conf
rename to uidocker/conf.d/default.conf
diff --git a/docker/upstream.conf.tpl b/uidocker/upstream.conf.tpl
similarity index 100%
rename from docker/upstream.conf.tpl
rename to uidocker/upstream.conf.tpl