From d8e3b503278a0bf092809e76c844baa30a4ae3e0 Mon Sep 17 00:00:00 2001
From: liangzai450 <liangzai450@sina.com>
Date: Thu, 10 Feb 2022 04:12:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=20?=
 =?UTF-8?q?=E5=BE=85=E6=B5=8B=E8=AF=95=E5=8F=AF=E5=90=A6=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=9B=BD=E5=86=85=E6=BA=90=E5=AE=89=E8=A3=85python=E6=89=A9?=
 =?UTF-8?q?=E5=B1=95=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dockerfile | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/dockerfile b/dockerfile
index 6298939..7ded1f8 100644
--- a/dockerfile
+++ b/dockerfile
@@ -9,19 +9,23 @@ ENV GO111MODULE=on \
 WORKDIR /builder
 
 COPY . .
-    && COPY public/icons ./public/default_icons
+COPY public/icons ./public/default_icons
 RUN go build .
 
 FROM python:3.8
-RUN pip3 install setuptools wheel  -i https://pypi.tuna.tsinghua.edu.cn/simple
-    && pip3 install beancount-2.3.4-cp38-cp38-linux_x86_64.whl
-    && pip3 install fava-1.18-py3-none-any.whl
+RUN python3 -m pip install -U pip setuptools wheel -i https://pypi.tuna.tsinghua.edu.cn/simple
+
+COPY ./beancount-2.3.4-cp38-cp38-linux_x86_64.whl /tmp
+RUN pip3 install /tmp/beancount-2.3.4-cp38-cp38-linux_x86_64.whl -i https://pypi.tuna.tsinghua.edu.cn/simple
+
+COPY ./fava-1.18-py3-none-any.whl /tmp
+RUN pip3 install /tmp/fava-1.18-py3-none-any.whl -i https://pypi.tuna.tsinghua.edu.cn/simple
 
 
 WORKDIR /app
 COPY --from=builder ./builder/public ./public
-    && COPY --from=builder ./builder/config ./config
-    && COPY --from=builder ./builder/template ./template
-    && COPY --from=builder ./builder/beancount-gs* ./
+COPY --from=builder ./builder/config ./config
+COPY --from=builder ./builder/template ./template
+COPY --from=builder ./builder/beancount-gs* ./
 
 EXPOSE 80
\ No newline at end of file