Merge pull request #153 from dooubb/master

删除多的&&和更新为python3
This commit is contained in:
zmister2016 2022-11-18 11:01:46 +08:00 committed by GitHub
commit 2c5c8ef692
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -10,9 +10,9 @@ WORKDIR /app/MrDoc
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
RUN set -x \
&& apk add --no-cache --virtual .build-deps build-base g++ gcc libxslt-dev python2-dev linux-headers \
&& apk add --no-cache --virtual .build-deps build-base g++ gcc libxslt-dev python3-dev linux-headers \
&& apk add --no-cache pwgen git tzdata zlib-dev freetype-dev jpeg-dev mariadb-dev postgresql-dev \
&& && pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple \
&& pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple \
&& python -m pip install --upgrade pip \
&& pip --no-cache-dir install -r requirements.txt \
&& pip --no-cache-dir install mysqlclient \
@ -21,4 +21,4 @@ RUN set -x \
&& apk del .build-deps \
&& rm -rf /var/cache/apk/*
ENTRYPOINT ["./docker_mrdoc.sh"]
ENTRYPOINT ["./docker_mrdoc.sh"]