From 6abafda194552a06827d4c68adf3dabb5075c4fb Mon Sep 17 00:00:00 2001
From: bestfeng1020 <31398465+bestfeng1020@users.noreply.github.com>
Date: Tue, 29 Aug 2023 09:20:31 +0800
Subject: [PATCH] =?UTF-8?q?fix(docker):=20=E8=A7=84=E8=8C=83=E7=A4=BE?=
 =?UTF-8?q?=E5=8C=BA=E5=8A=9Edocker=E9=95=9C=E5=83=8F=E5=91=BD=E5=90=8D=20?=
 =?UTF-8?q?(#415)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(docker): 规范社区办docker镜像命名

* fix(docker): 规范社区办docker镜像命名
---
 .github/workflows/maven.yml       | 4 ++--
 build-and-push-docker.sh          | 2 +-
 docker/run-all/docker-compose.yml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index be5c49ac..57dcf95d 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -20,8 +20,8 @@ jobs:
         path: ~/.m2
         key: ${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
     - name: Build with Maven
-      run: ./mvnw clean install -Dmaven.build.timestamp="$(date "+%Y-%m-%d %H:%M:%S")" -Dmaven.test.skip=true -Pbuild && cd jetlinks-standalone && docker build -t registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-standalone:$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) .
+      run: ./mvnw clean install -Dmaven.build.timestamp="$(date "+%Y-%m-%d %H:%M:%S")" -Dmaven.test.skip=true -Pbuild && cd jetlinks-standalone && docker build -t registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-community:$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) .
     - name: Login Docker Repo
       run: echo "${{ secrets.ALIYUN_DOCKER_REPO_PWD }}" | docker login registry.cn-shenzhen.aliyuncs.com -u ${{ secrets.ALIYUN_DOCKER_REPO_USERNAME }} --password-stdin
     - name: Push Docker
-      run: docker push registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-standalone:$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+      run: docker push registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-community:$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
diff --git a/build-and-push-docker.sh b/build-and-push-docker.sh
index dffff12a..0a3ac0a6 100755
--- a/build-and-push-docker.sh
+++ b/build-and-push-docker.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-dockerImage=registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-standalone:$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+dockerImage=registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-community:$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
 ./mvnw clean package -Dmaven.test.skip=true -Dmaven.build.timestamp="$(date "+%Y-%m-%d %H:%M:%S")"
 if [ $? -ne 0 ];then
     echo "构建失败!"
diff --git a/docker/run-all/docker-compose.yml b/docker/run-all/docker-compose.yml
index be9c16a6..1b01467c 100644
--- a/docker/run-all/docker-compose.yml
+++ b/docker/run-all/docker-compose.yml
@@ -59,7 +59,7 @@ services:
     links:
       - jetlinks:jetlinks
   jetlinks:
-    image: registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-standalone:2.2.0-SNAPSHOT
+    image: registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-community:2.2.0-SNAPSHOT
     container_name: jetlinks-ce
 
     ports: