fix: 修复 CI

.dockerignore

@@ -1 +1,3 @@
-ui
+**/node_modules
+**/dist
+**/build

.github/workflows/docker.yml

@@ -30,6 +30,7 @@ jobs:
         name: Login to AliyunCS
         uses: docker/login-action@v1
         with:
+          registry: registry.cn-shanghai.aliyuncs.com
           username: ${{ secrets.ALI_USER  }}
           password: ${{ secrets.ALI_PASSWORD  }}
       -

.github/workflows/release.yml

@@ -22,11 +22,14 @@ jobs:
         uses: actions/setup-go@v2
         with:
           go-version: 1.17
+      - name: install node-gpy
+        run: |
+          apt install -y python3 make gcc g++
       - name: build public files
         run: |
           echo "清空原有数据"
           rm -rf ./public
-          mkdir public/admin
+          mkdir -p public/admin
           echo '构建用户页面'
           cd ui/website && && pnpm install && pnpm build && cd ../../
           cp -r ui/website/build/* public/

Dockerfile

@@ -1,6 +1,35 @@
-FROM ubuntu:20.04
+FROM mereith/node-gyp:14 AS feBuilder
 WORKDIR /app
-COPY ./nav /app/nav
-# VOLUME [ "/data" ]
-EXPOSE 8233
-ENTRYPOINT [ "/app/nav" ]
+# RUN apk add --no-cache --virtual .build-deps alpine-sdk python
+COPY . .
+RUN yarn config set registry https://registry.npm.taobao.org && yarn global add typescript
+RUN cd /app && cd ui/admin && yarn && yarn build && cd ../..
+RUN cd ui/website && yarn && yarn build && cd ../..
+RUN cd /app && mkdir -p public/admin
+RUN cp -r ui/website/build/* public/
+RUN cp -r ui/admin/dist/* public/admin/
+RUN sed -i 's/\/assets/\/admin\/assets/g' public/admin/index.html
+
+
+FROM golang:alpine AS binarybuilder
+RUN apk --no-cache --no-progress add  git
+WORKDIR /app
+COPY . .
+COPY --from=feBuilder /app/public /app/public
+RUN cd /app && ls -la && go mod tidy && go build .
+
+
+
+FROM alpine:latest
+ENV TZ="Asia/Shanghai"
+RUN apk --no-cache --no-progress add \
+    ca-certificates \
+    tzdata && \
+    cp "/usr/share/zoneinfo/$TZ" /etc/localtime && \
+    echo "$TZ" >  /etc/timezone
+WORKDIR /app
+COPY --from=binarybuilder /app/nav /app/
+
+VOLUME ["/app/data"]
+EXPOSE 6412
+ENTRYPOINT [ "/app/nav" ]

node-gyp/Dockerfile

@@ -0,0 +1,2 @@
+FROM node:14-alpine
+RUN apk add --no-cache g++ gcc make python3

version.txt

@@ -1 +1 @@
-1.0.7
+1.0.10