update docker build

.github/workflows/release.yml

@@ -18,20 +18,25 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v3
 
-      # - name: Setup node
-      #   uses: actions/setup-node@v3
-      #   with:
-      #     node-version: 14
+      - name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 14
+
+      - name: Build admin
+        run: |
+          cd admin
+          npm install -g yarn
+          yarn
+          VITE_ADMIN_VERSION=${{ env.RELEASE_VERSION }} yarn build
+          cd ..
 
-      # - name: Build admin
+      # - name: Scp admin
       #   env:
       #     host: 'ubuntu@en.dtm.pub'
       #     dest: '/data/dtm-admin/'
       #   run: |
       #     cd admin
-      #     npm install -g yarn
-      #     yarn
-      #     VITE_ADMIN_VERSION=${{ env.RELEASE_VERSION }} yarn build
       #     echo "${{secrets.DEPLOY_KEY}}" > deploy_key
       #     chmod 600 ./deploy_key
       #     tar -cvzf dist.tar.gz dist

helper/Dockerfile-release

@@ -1,9 +1,9 @@
 # syntax=docker/dockerfile:1
-FROM node:14.19-alpine as builder1
-ARG RELEASE_VERSION
-WORKDIR /app/dtm
-COPY . .
-RUN cd admin && yarn && VITE_ADMIN_VERSION=$RELEASE_VERSION yarn build
+# FROM node:14.19-alpine as builder1
+# ARG RELEASE_VERSION
+# WORKDIR /app/dtm
+# COPY . .
+# RUN cd admin && yarn && VITE_ADMIN_VERSION=$RELEASE_VERSION yarn build
 
 FROM --platform=$TARGETPLATFORM golang:1.16-alpine as builder2
 ARG TARGETARCH
@@ -13,7 +13,7 @@ WORKDIR /app/dtm
 # RUN go env -w GOPROXY=https://mirrors.aliyun.com/goproxy/,direct
 EXPOSE 8080
 COPY . .
-COPY --from=builder1 /app/dtm/admin/dist /app/dtm/admin
+# COPY --from=builder1 /app/dtm/admin/dist /app/dtm/admin
 RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags="-s -w -X main.Version=$RELEASE_VERSION"
 
 FROM --platform=$TARGETPLATFORM alpine