From 0bde1b0c05c7c26deb51485ba7e35c1a9637ead4 Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Mon, 13 May 2024 10:39:00 +0800
Subject: [PATCH] =?UTF-8?q?:whale:=20=E4=BF=AE=E6=94=B9=20docker=20?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml            |  4 +---
 docker/mysql/Dockerfile       | 10 +++++-----
 docker/mysql/build.sh         |  7 +++++++
 docker/orion-ops-pro/build.sh |  6 +++---
 4 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 docker/mysql/build.sh

diff --git a/docker-compose.yml b/docker-compose.yml
index f2bfc08a..6f8f21f0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,9 +19,7 @@ services:
       - orion-ops-pro-db
       - orion-ops-pro-redis
   orion-ops-pro-db:
-    build:
-      context: .
-      dockerfile: docker/mysql/Dockerfile
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro-mysql:1.0.7
     privileged: true
     ports:
       - 3307:3306
diff --git a/docker/mysql/Dockerfile b/docker/mysql/Dockerfile
index af0a5a49..dac50a1d 100644
--- a/docker/mysql/Dockerfile
+++ b/docker/mysql/Dockerfile
@@ -1,9 +1,9 @@
 FROM mysql:8.0.28
-COPY sql/init-1-schema-databases.sql /tmp
-COPY sql/init-2-schema-tables.sql /tmp
-COPY sql/init-3-schema-quartz.sql /tmp
-COPY sql/init-4-data.sql /tmp
-COPY docker/mysql/my.cnf /etc/mysql/conf.d/my.cnf
+COPY ./sql/init-1-schema-databases.sql /tmp
+COPY ./sql/init-2-schema-tables.sql /tmp
+COPY ./sql/init-3-schema-quartz.sql /tmp
+COPY ./sql/init-4-data.sql /tmp
+COPY ./my.cnf /etc/mysql/conf.d/my.cnf
 RUN cat /tmp/init-1-schema-databases.sql >> /tmp/init.sql && \
     cat /tmp/init-2-schema-tables.sql >> /tmp/init.sql && \
     cat /tmp/init-3-schema-quartz.sql >> /tmp/init.sql && \
diff --git a/docker/mysql/build.sh b/docker/mysql/build.sh
new file mode 100644
index 00000000..597372e8
--- /dev/null
+++ b/docker/mysql/build.sh
@@ -0,0 +1,7 @@
+#/bin/bash
+version=1.0.7
+cp -r ../../sql ./sql
+docker build -t orion-ops-pro-mysql:${version} .
+rm -rf ./sql
+docker tag orion-ops-pro-mysql:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro-mysql:${version}
+docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro-mysql:${version}
diff --git a/docker/orion-ops-pro/build.sh b/docker/orion-ops-pro/build.sh
index 614d376e..29f79d71 100644
--- a/docker/orion-ops-pro/build.sh
+++ b/docker/orion-ops-pro/build.sh
@@ -1,9 +1,9 @@
 #/bin/bash
 version=1.0.7
-cp ../../sql/* ./
+mv ../../orion-ops-launch/target/orion-ops-launch.jar ./orion-ops-launch.jar
 mv ../../orion-ops-ui/dist ./dist
 docker build -t orion-ops-pro:${version} .
 rm -f ./orion-ops-launch.jar
 rm -rf ./dist
-docker tag orion-ops-pro:${version} registry.cn-hangzhou.aliyuncs.com/orion-ops/orion-ops-pro:${version}
-docker push registry.cn-hangzhou.aliyuncs.com/orion-ops/orion-ops-pro:${version}
+docker tag orion-ops-pro:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro:${version}
+docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro:${version}