From 688fdbff2a902cf8113b6d2a8082abaea631b59a Mon Sep 17 00:00:00 2001
From: whyour <imwhyour@gmail.com>
Date: Sun, 11 Apr 2021 18:18:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B9=85=E7=BC=A9=E5=87=8Fdocker?=
 =?UTF-8?q?=E9=95=9C=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/Dockerfile | 32 +++-----------------------------
 1 file changed, 3 insertions(+), 29 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4d348db1..aabae0ba 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,26 +1,3 @@
-FROM node:lts-alpine as build
-LABEL maintainer="whyour"
-ARG QL_BASE_URL=https://github.com.cnpmjs.org/whyour/qinglong
-ARG QL_BASE_BRANCH=master
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
-    LANG=zh_CN.UTF-8 \
-    SHELL=/bin/bash \
-    PS1="\u@\h:\w \$ " \
-    QL_DIR=/ql
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \
-    && apk update -f \
-    && apk upgrade \
-    && apk --no-cache add -f coreutils \
-                             moreutils \
-                             git \
-                             python \
-                             make \
-                             g++ \
-                             yarn \
-    && git clone -b ${QL_BASE_BRANCH} ${QL_BASE_URL} ${QL_DIR} \
-    && cd ${QL_DIR} \
-    && cp -f .env.example .env \
-    && yarn --network-timeout 100000
 FROM node:lts-alpine
 LABEL maintainer="whyour"
 ARG QL_BASE_URL=https://github.com.cnpmjs.org/whyour/qinglong
@@ -45,9 +22,7 @@ RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
                              perl \
                              openssl \
                              nginx \
-                             python \
-                             make \
-                             g++ \
+                             python3 \
                              yarn \
     && rm -rf /var/cache/apk/* \
     && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
@@ -68,9 +43,8 @@ RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
     && chmod 777 ${QL_DIR}/shell/*.sh \
     && chmod 777 ${QL_DIR}/docker/*.sh \
     && npm install -g pm2 \
-    && rm -rf /root/.npm
-COPY --from=build /ql/node_modules /ql/node_modules/
-RUN cd ${QL_DIR} \
+    && rm -rf /root/.npm \
+    && yarn install --network-timeout 100000 \
     && yarn build \
     && yarn build-back \
     && yarn install --production --network-timeout 100000 \