From fd8680940bb9ae2adab964d610598753dda162eb Mon Sep 17 00:00:00 2001
From: moonrailgun <moonrailgun@gmail.com>
Date: Thu, 15 Sep 2022 20:52:17 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=9C=BA=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

定义docker版本规范
---
 .github/workflows/docker-publish.yml | 2 ++
 client/web/build/webpack.config.ts   | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 21595fd0..774e9e19 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -44,3 +44,5 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+        env:
+          VERSION: docker-${{ steps.meta.outputs.tags }}
diff --git a/client/web/build/webpack.config.ts b/client/web/build/webpack.config.ts
index fb6ff53d..8ed2e099 100644
--- a/client/web/build/webpack.config.ts
+++ b/client/web/build/webpack.config.ts
@@ -48,9 +48,8 @@ const plugins: Configuration['plugins'] = [
     'process.env.NODE_ENV': JSON.stringify(NODE_ENV),
     'process.env.SERVICE_URL': JSON.stringify(process.env.SERVICE_URL),
     'process.env.VERSION': JSON.stringify(
-      `${process.env.VERSION || packageJson.version}-${dayjs().format(
-        'YYYYMMDDHHmm'
-      )}`
+      process.env.VERSION ||
+        `${packageJson.version}-${dayjs().format('YYYYMMDDHHmm')}`
     ),
   }),
   new HtmlWebpackPlugin({