From cf45f419a3b2ce8a91b8b4deaecd14e13cbc905e Mon Sep 17 00:00:00 2001
From: jxnkwlp <jxnkwlp@hotmail.com>
Date: Wed, 3 Jul 2024 23:17:09 +0800
Subject: [PATCH] update docker compose file

---
 .github/workflows/build-pack.yml | 37 ++++++++++++++++++++------------
 docker/docker-compose.yml        |  2 +-
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build-pack.yml b/.github/workflows/build-pack.yml
index 1e0d3d3..bd970bf 100644
--- a/.github/workflows/build-pack.yml
+++ b/.github/workflows/build-pack.yml
@@ -25,6 +25,7 @@ jobs:
         with:
           node-version: 18
           cache: "pnpm"
+          cache-dependency-path: "./ui"
 
       - name: Get pnpm store directory
         shell: bash
@@ -39,26 +40,34 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pnpm-store-
 
-      - name: Install dependencies
+      - name: UI build & pack
         run: |
           cd ./ui
           pnpm install
-
-      - name: build
-        run: |
           pnpm run build
+          mkdir -p ../docker/app
           cp -rf ./dist/ ../docker/app
 
+      - name: Git Version
+        id: version
+        uses: tomerfi/version-bumper-action@2.0.1
+
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
-      # - name: Docker build and push
-      #   uses: docker/build-push-action@v3
-      #   with:
-      #     context: ./
-      #     file: ./docker/zero-ui/Dockerfile
-      #     builder: ${{ steps.buildx.outputs.name }}
-      #     platforms: linux/amd64,linux/arm64,linux/arm
-      #     push: ${{ github.event_name != 'pull_request' }}
-      #     tags: ${{ steps.prep_zero-ui.outputs.tags }}
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCER_USERNAME }}
+          password: ${{ secrets.DOCER_TOKEN }}
+
+      - name: Docker build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: ./docker
+          file: ./docker/Dockerfile
+          builder: ${{ steps.buildx.outputs.name }}
+          platforms: linux/amd64,linux/arm64,linux/arm
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: passingwind/zt-ui:latest,passingwind/zt-ui:${{ steps.version.outputs.next  }}
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index fbc60c3..481bca7 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -16,7 +16,7 @@ services:
       - "9993:9993/udp"
       - "9993:9993/tcp"
   ui:
-    image: jxnkwlp/zt-ui:latest
+    image: passingwind/zt-ui:latest
     build:
       context: .
       dockerfile: ./Dockerfile