From f12c6ef2f525a075436daba234c0e53ab05f9913 Mon Sep 17 00:00:00 2001
From: jonnyan404 <475634114@qq.com>
Date: Mon, 22 Feb 2021 18:41:33 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E7=BA=BF=E5=90=9E=E6=8B=AC=E5=8F=B7bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/editor.md/editormd.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/editor.md/editormd.js b/static/editor.md/editormd.js
index 50b46da..ed28b52 100644
--- a/static/editor.md/editormd.js
+++ b/static/editor.md/editormd.js
@@ -3979,7 +3979,7 @@
             else if(/^timeline/i.test(lang)){ // 时间线
                 var time_line = '<ul class="layui-timeline">'
                 // console.log(code)
-                var timeline_code = code.split(/[(\r\n)\r\n]+/);
+                var timeline_code = code.split(/(\r\n\t|\n|\r\t)+/);
                 // console.log(timeline_code)
                 timeline_code.forEach(function(item,index){
                     // console.log(item,index)

From 56f1fbae02b8e1abec2de9f3f30c001ec9a8f27f Mon Sep 17 00:00:00 2001
From: jonnyan404 <475634114@qq.com>
Date: Mon, 22 Feb 2021 18:43:57 +0800
Subject: [PATCH 2/4] =?UTF-8?q?add=20Dockerfile.=E5=9F=BA=E4=BA=8Ealpine?=
 =?UTF-8?q?=20=E5=8F=A6=E5=A4=96:=E7=9B=AE=E5=89=8D=E5=8F=97=E9=99=90?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E9=95=9C=E5=83=8F=E9=99=90=E5=88=B6,?=
 =?UTF-8?q?=E5=90=8E=E7=BB=ADnginx=E7=89=88=E6=9C=AC,=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E4=BC=9A=E9=87=8D=E5=86=99.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..facfa13
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,22 @@
+FROM python:3.7-alpine
+LABEL maintainer="www.mrdoc.fun"
+ENV PYTHONUNBUFFERED=0 \
+    TZ=Asia/Shanghai \
+    LISTEN_PORT=10086\
+    USER=admin
+COPY . /app/MrDoc/
+
+WORKDIR /app/MrDoc
+
+RUN  set -x \
+    && apk add --no-cache --virtual .build-deps build-base g++ gcc libxslt-dev python2-dev linux-headers \
+    && apk add --no-cache pwgen git tzdata zlib-dev freetype-dev jpeg-dev  mariadb-dev postgresql-dev \
+    && pip --no-cache-dir install -r requirements.txt \
+    && pip --no-cache-dir install mysqlclient \
+    && chmod +x mrdoc.sh \
+    && apk del .build-deps \
+    && rm -rf /var/cache/apk/* \
+    && mkdir -p /usr/share/fonts/win \
+    && mv simsunb.ttf /usr/share/fonts/win
+
+ENTRYPOINT ["./mrdoc.sh"]
\ No newline at end of file

From bd02c6fa9d0865912b39c99b843cb897fc2e4152 Mon Sep 17 00:00:00 2001
From: jonnyan404 <475634114@qq.com>
Date: Mon, 22 Feb 2021 18:44:45 +0800
Subject: [PATCH 3/4] add mrdoc.sh.

---
 mrdoc.sh | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 mrdoc.sh

diff --git a/mrdoc.sh b/mrdoc.sh
new file mode 100644
index 0000000..f83cc14
--- /dev/null
+++ b/mrdoc.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+python /app/MrDoc/manage.py makemigrations && python /app/MrDoc/manage.py migrate && echo y |python /app/MrDoc/manage.py rebuild_index
+MM=`pwgen -1s`
+CREATE_USER=1
+if [ $CREATE_USER -eq 1 ]; then
+  if [ ! -e $CREATE_USER ]; then
+	    touch $CREATE_USER
+	    echo "-- First container startup --user:${USER} pwd:${MM}"
+            echo "from django.contrib.auth import get_user_model; User = get_user_model(); User.objects.create_superuser('${USER}', 'www@mrdoc.fun', '${MM}')" | python /app/MrDoc/manage.py shell
+		    # YOUR_JUST_ONCE_LOGIC_HERE
+	    else
+		        echo "-- Not first container startup --"
+  fi
+
+else
+	        echo "user switch not create"
+
+fi
+
+
+python -u /app/MrDoc/manage.py runserver --noreload 0.0.0.0:${LISTEN_PORT}
+exec "$@"
\ No newline at end of file

From 4d05f4efe234d984189180a06377666d71b7283f Mon Sep 17 00:00:00 2001
From: jonnyan404 <475634114@qq.com>
Date: Mon, 22 Feb 2021 18:46:53 +0800
Subject: [PATCH 4/4] update Dockerfile.

---
 Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index facfa13..3d46fd3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,8 +15,6 @@ RUN  set -x \
     && pip --no-cache-dir install mysqlclient \
     && chmod +x mrdoc.sh \
     && apk del .build-deps \
-    && rm -rf /var/cache/apk/* \
-    && mkdir -p /usr/share/fonts/win \
-    && mv simsunb.ttf /usr/share/fonts/win
+    && rm -rf /var/cache/apk/* 
 
 ENTRYPOINT ["./mrdoc.sh"]
\ No newline at end of file