diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..e8e2535 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "YYeTsFE"] + path = YYeTsFE + url = https://github.com/wyx1818/YYeTsFE diff --git a/Dockerfile b/Dockerfile index 625e82e..abe1a1a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.9-alpine as builder +FROM python:3.9-alpine as pybuilder RUN apk update && apk add --no-cache tzdata ca-certificates alpine-sdk libressl-dev libffi-dev cargo && \ apk add tiff-dev jpeg-dev openjpeg-dev zlib-dev freetype-dev lcms2-dev \ @@ -9,12 +9,19 @@ RUN pip3 install --user -r /requirements.txt && rm /requirements.txt +FROM node:alpine as nodebuilder +COPY . /YYeTsBot +WORKDIR /YYeTsBot/YYeTsFE +RUN yarn && yarn build + FROM python:3.9-alpine -COPY --from=builder /root/.local /usr/local -COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=builder /usr/share/zoneinfo /usr/share/zoneinfo COPY . /YYeTsBot +COPY --from=pybuilder /root/.local /usr/local +COPY --from=pybuilder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ +COPY --from=pybuilder /usr/share/zoneinfo /usr/share/zoneinfo +COPY --from=nodebuilder /YYeTsBot/YYeTsFE/build /YYeTsBot/yyetsweb + RUN apk update && apk add --no-cache libressl jpeg-dev openjpeg-dev libimagequant-dev tiff-dev freetype-dev libxcb-dev ENV TZ=Asia/Shanghai diff --git a/YYeTsFE b/YYeTsFE new file mode 160000 index 0000000..49abae8 --- /dev/null +++ b/YYeTsFE @@ -0,0 +1 @@ +Subproject commit 49abae8d9cbfa60e7764d7f0a04796d8c626fad3