From 0ea992de5d555ab7ccf0eb56c826a9c2eb8ec8ee Mon Sep 17 00:00:00 2001
From: RenChu <patrick1031wang@gmail.com>
Date: Wed, 8 Jun 2022 01:49:49 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=9B=A0=EF=B8=8F=20Fix=20and=20test=20afte?=
 =?UTF-8?q?r=20the=20merge.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There are just too many changes, and they just don't work well together.
---
 Dockerfile | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f5c3c36f..74dc8ba6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,29 +1,18 @@
-# build frontend
-FROM node:18-alpine as frontend
-WORKDIR /web
-COPY web/ ./
-RUN echo 'VITE_HOST=""'>.env && yarn && yarn build
-
 # build backend
 FROM golang:1.18-alpine AS backend
-RUN apk --no-cache --no-progress add --virtual \
-  build-deps \
-  build-base \
-  git
+RUN apk --no-cache --no-progress add --virtual build-deps build-base git
 
 WORKDIR /paopao-ce
 COPY . .
-COPY --from=frontend /web/dist ./web/dist
-ENV GOPROXY=https://goproxy.cn
-RUN make build TAGS='embed'
+RUN CGO_ENABLED=0 go build .
 
 FROM alpine:3.16
 ENV TZ=Asia/Shanghai
 RUN apk update && apk add --no-cache ca-certificates && update-ca-certificates
 
-COPY --from=build-env /paopao-ce/paopao-ce /usr/bin/paopao-ce
-COPY --from=build-env /paopao-ce/assets/comic.ttf /assets/comic.ttf
-COPY --from=build-env /paopao-ce/configs /configs
+COPY --from=backend /paopao-ce/paopao-ce /usr/bin/paopao-ce
+COPY --from=backend /paopao-ce/assets/comic.ttf /assets/comic.ttf
+COPY --from=backend /paopao-ce/configs /configs
 COPY config.yaml .
 
 EXPOSE 8000