From a1e1afd91b7a7377cd8fc69a3b6f26f6b72ecd6a Mon Sep 17 00:00:00 2001 From: JohnDoeAntler <16289028+JohnDoeAntler@users.noreply.github.com> Date: Mon, 8 Aug 2022 12:25:36 +0800 Subject: [PATCH] update requirements.txt and Dockerfile for successful build --- Dockerfile | 4 +++- requirements.txt | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9b1136f10..3f55ef172 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.5-alpine +FROM python:3.8-alpine RUN apk add --update \ supervisor \ @@ -24,6 +24,8 @@ RUN ln -sf /dev/stdout /var/log/nginx/access.log && \ ADD . . +RUN mkdir /etc/nginx/conf.d + RUN mv docker/nginx/nginx.conf /etc/nginx/nginx.conf && \ mv docker/nginx/default.conf /etc/nginx/conf.d/default.conf && \ mv docker/supervisor.conf /etc/supervisor.conf && \ diff --git a/requirements.txt b/requirements.txt index bdda42ecf..734ebab3e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,8 @@ raven[flask]==6.0.0 # Database pymysql==0.8.0 -SQLAlchemy>=1.3.0 +SQLAlchemy<1.4.0 +markupsafe==2.0.1 # Caching redis==2.10.5 @@ -76,7 +77,7 @@ idna<2.9,>=2.5 # Front end itsdangerous==0.24 cssmin==0.2.0 -jsmin==2.2.1 +jsmin==3.0.1 hashids==1.2.0 pygments==2.2.0 humanize==0.5.1