rollback dockerfile

Author: staugur

Dockerfile

@@ -1,19 +1,22 @@
-FROM python:3.8-alpine
+# -- build dependencies with debian(multiarch) --
+FROM python:3.8-slim AS build
 LABEL [email protected]
 ARG PIPMIRROR=https://pypi.org/simple
+COPY requirements /requirements
+RUN pip install --timeout 30 --index $PIPMIRROR --user --no-cache-dir --no-warn-script-location -r /requirements/all.txt
+
+# -- app environment(multiarch) --
+FROM python:3.8-alpine
 ARG ALPINEMIRROR=dl-cdn.alpinelinux.org
 ENV sapic_isrun=true
-COPY requirements /requirements
-RUN sed -i "s/dl-cdn.alpinelinux.org/${ALPINEMIRROR}/g" /etc/apk/repositories && \
-    apk upgrade --no-cache && \
+COPY --from=build /root/.local /root/.local
+RUN apk upgrade --no-cache && \
     apk add --no-cache libgcc libstdc++ gcompat && \
-    pip install --upgrade pip && \
-    pip install --timeout 30 --index $PIPMIRROR --user --no-cache-dir --no-warn-script-location -r /requirements/all.txt && \
-    LOCAL_PKG="/root/.local" && \
-    ln -sf ${LOCAL_PKG}/bin/flask ${LOCAL_PKG}/bin/gunicorn /bin/ && \
+    pip install --no-cache-dir --user -U pip pillow && \
+    ln -sf /root/.local/bin/flask /root/.local/bin/gunicorn /bin/ && \
     ln -sf $(which python) /python && \
     sed -i "s#$(which python)#/python#" /bin/gunicorn
 WORKDIR /picbed
 COPY src /picbed
 EXPOSE 9514
-ENTRYPOINT ["gunicorn", "app:app", "-c", "sapicd.py"]
+ENTRYPOINT ["gunicorn", "app:app", "-c", "sapicd.py"]

docs/changelog.rst

@@ -11,7 +11,7 @@ Released in 2023-1-9
 
 - 修复：redis 3.x版本，cli创建用户失败，感谢 @moria
 - 更改：redis hmset 命令更换为 hset
-- 更改：dockerfile取消分阶段构建（fix pillow import error）
+- 修复：docker pillow import error
 
 v1.16.0
 --------