From d5b4faa49ca1252265049b5bde422f2cafe7c4cf Mon Sep 17 00:00:00 2001
From: tjq <tengjiqi@gmail.com>
Date: Sat, 28 Jan 2023 12:16:47 +0800
Subject: [PATCH] chore: update docker build script

---
 docker-compose.yml                            |  8 +++---
 .../build_docker.sh => dev/publish_docker.sh} | 27 +++++++++++++++++++
 2 files changed, 30 insertions(+), 5 deletions(-)
 rename others/{script/build_docker.sh => dev/publish_docker.sh} (74%)

diff --git a/docker-compose.yml b/docker-compose.yml
index d12faee8..cdec2914 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,14 +5,12 @@
 version: '3'
 services:
   powerjob-mysql:
-    build:
-      context: ./others
     environment:
       MYSQL_ROOT_HOST: "%"
       MYSQL_ROOT_PASSWORD: No1Bug2Please3!
     restart: always
     container_name: powerjob-mysql
-    image: powerjob/powerjob-mysql:4.1.1
+    image: powerjob/powerjob-mysql:latest
     ports:
       - "3307:3306"
     volumes:
@@ -21,7 +19,7 @@ services:
 
   powerjob-server:
     container_name: powerjob-server
-    image: tjqq/powerjob-server:latest
+    image: powerjob/powerjob-server:latest
     restart: always
     depends_on:
       - powerjob-mysql
@@ -36,7 +34,7 @@ services:
 
   powerjob-worker-samples:
     container_name: powerjob-worker-samples
-    image: tjqq/powerjob-worker-samples:latest
+    image: powerjob/powerjob-worker-samples:latest
     restart: always
     depends_on:
       - powerjob-mysql
diff --git a/others/script/build_docker.sh b/others/dev/publish_docker.sh
similarity index 74%
rename from others/script/build_docker.sh
rename to others/dev/publish_docker.sh
index 4149668e..ee295e3d 100755
--- a/others/script/build_docker.sh
+++ b/others/dev/publish_docker.sh
@@ -33,11 +33,19 @@ read -r -p "是否重新构建镜像（y/n）:" rebuild
 if [ "$rebuild" = "y" ] || [  "$rebuild" = "Y" ]; then
   echo "================== 删除旧镜像 =================="
   docker rmi -f tjqq/powerjob-server:$version
+  docker rmi -f powerjob/powerjob-server:$version
   docker rmi -f tjqq/powerjob-agent:$version
+  docker rmi -f powerjob/powerjob-agent:$version
+  docker rmi -f powerjob/powerjob-mysql:$version
+  docker rmi -f powerjob/powerjob-worker-samples:$version
   echo "================== 构建 powerjob-server 镜像 =================="
   docker build -t tjqq/powerjob-server:$version powerjob-server/docker/. || exit
   echo "================== 构建 powerjob-agent 镜像 =================="
   docker build -t tjqq/powerjob-agent:$version powerjob-worker-agent/. || exit
+  echo "================== 构建 powerjob-mysql 镜像 =================="
+  docker build -t powerjob/powerjob-mysql:$version others/. || exit
+  echo "================== 构建 powerjob-worker-samples 镜像 =================="
+  docker build -t powerjob/powerjob-worker-samples:$version powerjob-worker-samples/. || exit
 
   read -r -p "是否正式发布该镜像（y/n）:" needrelease
   if [ "$needrelease" = "y" ] || [  "$needrelease" = "Y" ]; then
@@ -47,6 +55,25 @@ if [ "$rebuild" = "y" ] || [  "$rebuild" = "Y" ]; then
       docker push tjqq/powerjob-server:$version
       echo "================== 正在推送 agent 镜像到中央仓库 =================="
       docker push tjqq/powerjob-agent:$version
+      echo "================== 正在推送 powerjob-mysql 镜像到中央仓库 =================="
+      docker push powerjob/powerjob-mysql:$version
+      echo "================== 正在推送 samples 镜像到中央仓库 =================="
+      docker push powerjob/powerjob-worker-samples:$version
+      echo "================== 双写推送 =================="
+      docker tag tjqq/powerjob-server:$version powerjob/powerjob-server:$version
+      docker push powerjob/powerjob-server:$version
+      docker tag tjqq/powerjob-agent:$version powerjob/powerjob-agent:$version
+      docker push powerjob/powerjob-agent:$version
+      echo "================== 更新 LATEST 版本 =================="
+      docker tag powerjob/powerjob-server:$version powerjob/powerjob-server:latest
+      docker push powerjob/powerjob-server:latest
+      docker tag powerjob/powerjob-agent:$version powerjob/powerjob-agent:latest
+      docker push powerjob/powerjob-agent:latest
+      docker tag powerjob/powerjob-mysql:$version powerjob/powerjob-mysql:latest
+      docker push powerjob/powerjob-mysql:latest
+      docker tag powerjob/powerjob-worker-samples:$version powerjob/powerjob-worker-samples:latest
+      docker push powerjob/powerjob-worker-samples:latest
+      echo "================== Docker 推送完毕 =================="
     fi
   fi
 fi