i8

.gitea/workflows/docker.yml

@@ -82,6 +82,9 @@ jobs:
           echo "BUILD_TARGET=$BUILD_TARGET" >> $GITHUB_ENV
           echo "Decided BUILD_TARGET=$BUILD_TARGET"
 
+      - name: Read version from package.json
+        run: echo "VERSION=$(jq -r .version package.json)" >> $GITHUB_ENV
+
       - name: Build Admin (turbo via bun)
         if: env.BUILD_TARGET == 'admin' || env.BUILD_TARGET == 'both'
         run: bun run build --filter=ppanel-admin-web
@@ -92,14 +95,19 @@ jobs:
 
       - name: Build Docker (admin)
         if: env.BUILD_TARGET == 'admin' || env.BUILD_TARGET == 'both'
-        run: make build-admin
+        run: docker build -f ./docker/ppanel-admin-web/Dockerfile -t ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-admin-web:${{ env.VERSION }} .
 
       - name: Build Docker (user)
         if: env.BUILD_TARGET == 'user' || env.BUILD_TARGET == 'both'
-        run: make build-user
+        run: docker build -f ./docker/ppanel-user-web/Dockerfile -t ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-user-web:${{ env.VERSION }} .
 
-      - name: Push Docker Images
-        run: make push
+      - name: Push Docker Image (admin)
+        if: env.BUILD_TARGET == 'admin' || env.BUILD_TARGET == 'both'
+        run: docker push ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-admin-web:${{ env.VERSION }}
+
+      - name: Push Docker Image (user)
+        if: env.BUILD_TARGET == 'user' || env.BUILD_TARGET == 'both'
+        run: docker push ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-user-web:${{ env.VERSION }}
 
       - name: Notify success to Telegram
         uses: chapvic/telegram-notify@master