From 7a87516d17b97ef6897e1cadc75ec4b81b1e185d Mon Sep 17 00:00:00 2001
From: Max <shadow.iqka@qq.com>
Date: Thu, 10 Feb 2022 01:30:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20docker?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/yao/Dockerfile   | 18 +++++++++---------
 docker/yao/conf/yao.env | 21 +++++++--------------
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/docker/yao/Dockerfile b/docker/yao/Dockerfile
index 55c794f0..159b1896 100644
--- a/docker/yao/Dockerfile
+++ b/docker/yao/Dockerfile
@@ -1,20 +1,20 @@
 # ===========================================
-#  Yao 0.9.22+ MySQL 8.0.27
-#  docker build -t yaoapp/yao:0.9.22 .
+#  Yao 0.9.0+ MySQL 8.0.27
+#  docker build -t yaoapp/yao:0.9.0 .
 # ===========================================
 FROM debian:buster-slim
 RUN groupadd -r yao && useradd -r -g yao yao
 RUN sed -i 's#http://deb.debian.org#http://mirrors.163.com#g' /etc/apt/sources.list && \
     apt-get update && apt-get install -y curl supervisor sudo procps net-tools && \
     mkdir -p /data/app && \
-    mkdir -p /data/logs && \
-    mkdir -p /data/app/db && \
-    chown -R yao:yao /data && \
-    echo user=root >> /etc/supervisor/supervisord.conf && \
-    curl -fsSL https://demo-crm.iqka.com/releases/0.9.22/install.sh | bash
+    # mkdir -p /data/logs && \
+    # mkdir -p /data/app/db && \
+    # chown -R yao:yao /data && \
+    # echo user=root >> /etc/supervisor/supervisord.conf && \
+    curl -fsSL https://release.yaoapps.com/install.sh | bash
 
-COPY conf/yao.conf /etc/supervisor/conf.d/yao.conf
-COPY conf/yao.env /data/app/.env
+# COPY conf/yao.conf /etc/supervisor/conf.d/yao.conf
+# COPY conf/yao.env /data/app/.env
 VOLUME /data/app
 EXPOSE 5099 3321
 ENTRYPOINT ["tail"]
diff --git a/docker/yao/conf/yao.env b/docker/yao/conf/yao.env
index a2e789e6..edebd0f2 100644
--- a/docker/yao/conf/yao.env
+++ b/docker/yao/conf/yao.env
@@ -1,14 +1,7 @@
-XIANG_MODE="debug"
-
-# 服务器配置
-XIANG_SERVICE_HOST=0.0.0.0
-XIANG_SERVICE_PORT=5099
-XIANG_SESSION_PORT=3321
-
-# 数据库配置
-XIANG_DB_DEBUG=true
-XIANG_DB_AESKEY="ZLX=T&f6refeCh-ro*r@"
-
-# JWT配置
-XIANG_JWT_DEBUG=true
-XIANG_JWT_SECRET="bLp@bi!oqo-2U+hoTRUG"
\ No newline at end of file
+YAO_ENV=production
+YAO_JWT_SECRET="qffgameana6VLuw4LZ?x"
+YAO_HOST=0.0.0.0
+YAO_PORT=5099
+YAO_LOG="/data/app/logs/application.log"
+YAO_DB_DRIVER=sqlite3
+YAO_DB_PRIMARY="/data/app/db/yao.db"
\ No newline at end of file