Merge branch 'dev'

FHU-yezi · Jun 6, 2022 · b64e951 · b64e951
2 parents 1302cb7 + ef8fa96
commit b64e951
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,11 +1,15 @@
 FROM python:3.8.10-slim
 
+ENV TZ Asia/Shanghai
+
 WORKDIR /app
 
 COPY requirements.txt .
 
-RUN pip install -r requirements.txt -i https://mirrors.aliyun.com/pypi/simple \
-    && rm -rf ~/.cache/pip
+RUN pip install \
+    -r requirements.txt \
+    --no-cache-dir \
+    -i https://mirrors.aliyun.com/pypi/simple
 
 COPY . .
 

diff --git a/config.yaml b/config.yaml
@@ -1,4 +1,4 @@
-version: 1.4.1
+version: 1.4.2
 port: 8602
 mainpage_footer: 'Made with <a href="https://github.com/FHU-yezi/JianshuResearchTools/" style="color: #0056B3">JRT</a>, <a href="https://github.com/pywebio/PyWebIO" style="color: #0056B3">PyWebIO</a> and ♥'
 service_pages_footer: 'Powered By <a href="https://github.com/FHU-yezi/JianshuResearchTools/" style="color: #0056B3">JRT</a> and <a href="https://github.com/pywebio/PyWebIO" style="color: #0056B3">PyWebIO</a>'

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   main:
-    image: jianshumicrofeatures:1.4.1
+    image: jianshumicrofeatures:1.4.2
     build: .
     ports:
       - "8602:8602"
@@ -15,4 +15,5 @@ services:
       restart_policy:
         condition: on-failure
         delay: 5s
-        max_attempts: 3
+        max_attempts: 3
+    stop_grace_period: 1s