From d0bfd70ef599ae81f115beae162bce204da06ff4 Mon Sep 17 00:00:00 2001
From: JiaJu Zhuang <5152853@qq.com>
Date: Sun, 2 Jul 2023 21:34:08 +0800
Subject: [PATCH] release docker

---
 .github/workflows/pushdocker.yml | 13 +++++++------
 docker/Dockerfile                |  4 ++--
 docker/docker-build.sh           |  1 -
 3 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 docker/docker-build.sh

diff --git a/.github/workflows/pushdocker.yml b/.github/workflows/pushdocker.yml
index ed7fe70c..eeb57ee8 100644
--- a/.github/workflows/pushdocker.yml
+++ b/.github/workflows/pushdocker.yml
@@ -3,9 +3,10 @@
 name: Push To Docker
 
 # Workflow's trigger
-on:
-  release:
-    types: [ published ]
+#on:
+#  release:
+#    types: [ published ]
+on: [ push, pull_request ]
 
 # Workflow's jobs
 jobs:
@@ -44,10 +45,10 @@ jobs:
       # 构建静态文件信息
       - name: Npm install & build & copy
         run: |
-          cd ali-dbhub-client
+          cd chat2db-client
           npm install 
           npm run build:desktop
-          mv dist ../ali-dbhub-server/ali-dbhub-server-start/src/main/resources/static/front
+          mv dist ../chat2db-server/chat2db-server-start/src/main/resources/static/front
 
       # 安装java
       - name: Install Java and Maven
@@ -59,7 +60,7 @@ jobs:
 
       # 编译服务端java版本
       - name: Build Java
-        run: mvn clean package -B '-Dmaven.test.skip=true' -f ali-dbhub-server/pom.xml
+        run: mvn clean package -B '-Dmaven.test.skip=true' -f chat2db-server/pom.xml
       
 
       - name: Set up QEMU
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 153b3c2e..8d4fcdbf 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -3,8 +3,8 @@ FROM openjdk:17
 # 定义进入容器时默认位置，接下来后续操作的工作位置
 WORKDIR /app
 # 将当前目录下的jar包复制到docker容器的/app 目录下
-ADD ali-dbhub-server/ali-dbhub-server-start/target/ali-dbhub-server-start.jar ali-dbhub-server-start.jar
+ADD chat2db-server/chat2db-server-start/target/chat2db-server-start.jar chat2db-server-start.jar
 # 让当前容器暴露10824
 EXPOSE 10824
 # 运行jar包
-ENTRYPOINT ["java","-Dspring.profiles.active=release","-jar","ali-dbhub-server-start.jar"]
\ No newline at end of file
+ENTRYPOINT ["java","-Dspring.profiles.active=release","-jar","chat2db-server-start.jar"]
\ No newline at end of file
diff --git a/docker/docker-build.sh b/docker/docker-build.sh
deleted file mode 100644
index 38dc3d71..00000000
--- a/docker/docker-build.sh
+++ /dev/null
@@ -1 +0,0 @@
-docker build --no-cache -f docker/Dockerfile -t chat2db/chat2db:v1.0.111-dev .
\ No newline at end of file