From 6b1c613144d477228c94e2d68b6c7561f18e066e Mon Sep 17 00:00:00 2001
From: Acdiost <38416288+acdiost@users.noreply.github.com>
Date: Thu, 30 Jun 2022 10:47:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index d6e1fe0..075bf54 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,6 +11,7 @@ RUN git clone https://gitee.com/yllan/ferry_web.git
 WORKDIR ferry_web
 
 RUN npm install -g cnpm --registry=https://registry.npmmirror.com
+RUN npm uninstall node-sass && npm i -D sass --registry=https://registry.npmmirror.com
 RUN cnpm install
 RUN echo $'# just a flag\n\
 ENV = \'production\'\n\n\

From b29e8d28b3f25b47ac36350e959ee0ba7fa823b4 Mon Sep 17 00:00:00 2001
From: Acdiost <38416288+acdiost@users.noreply.github.com>
Date: Thu, 30 Jun 2022 10:51:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=20docker-compose?=
 =?UTF-8?q?.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

touch ferry/config/needinit && docker build -t feryy:latest . && docker-compose up -d
---
 docker-compose.yml | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..41bcc21
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,31 @@
+version: '3'
+services:
+
+  ferry_mysql:
+    image: mysql:8
+    container_name: ferry_mysql
+    restart: unless-stopped
+    environment:
+      MYSQL_ROOT_PASSWORD: '123456'
+      MYSQL_DATABASE: 'ferry'
+      MYSQL_USER: 'ferry'
+      MYSQL_PASSWORD: '123456'
+
+
+  ferry_redis:
+    container_name: ferry_redis
+    image: redis:latest
+    restart: unless-stopped
+    command: redis-server --save 60 1 --loglevel warning
+
+  ferry:
+    image: ferry:latest
+    container_name: ferry
+    restart: unless-stopped
+    depends_on:
+      - ferry_mysql
+      - ferry_redis
+    ports:
+      - "8002:8002"
+    volumes:
+      - ./config:/opt/workflow/ferry/config