From 22cafa10924377cf015cb400d4fbcf1b7a2a50a3 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Mon, 29 Apr 2024 01:08:39 +0800
Subject: [PATCH] update build script.

---
 docker-compose.yml          |  2 +-
 docker/mysql/Dockerfile     |  6 +++---
 docker/mysql/build.sh       |  5 +++++
 docker/orion-ops/Dockerfile | 10 +++++-----
 docker/orion-ops/build.sh   |  5 +++++
 5 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 docker/mysql/build.sh
 create mode 100644 docker/orion-ops/build.sh

diff --git a/docker-compose.yml b/docker-compose.yml
index f0abd2e3..b2fff4ea 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,7 @@ services:
       - orion-ops-db
       - orion-ops-redis
   orion-ops-db:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-mysql:latest
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-mysql:1.2.3
     privileged: true
     environment:
       - MYSQL_DATABASE=orion-ops
diff --git a/docker/mysql/Dockerfile b/docker/mysql/Dockerfile
index 87cdabd9..8881f6ca 100644
--- a/docker/mysql/Dockerfile
+++ b/docker/mysql/Dockerfile
@@ -1,7 +1,7 @@
 FROM mysql:8.0.28
-COPY sql/init-data.sql /tmp
-COPY sql/init-schema.sql /tmp
-COPY docker/mysql/my.cnf /etc/mysql/conf.d/my.cnf
+COPY ./init-data.sql /tmp
+COPY ./init-schema.sql /tmp
+COPY ./my.cnf /etc/mysql/conf.d/my.cnf
 RUN cat /tmp/init-schema.sql >> /tmp/orion.sql && \
     cat /tmp/init-data.sql >> /tmp/orion.sql && \
     cp /tmp/orion.sql /docker-entrypoint-initdb.d
diff --git a/docker/mysql/build.sh b/docker/mysql/build.sh
new file mode 100644
index 00000000..db08b7a2
--- /dev/null
+++ b/docker/mysql/build.sh
@@ -0,0 +1,5 @@
+mv ../../sql/init-schema.sql ./
+mv ../../sql/init-data.sql ./
+docker build -t orion-ops-mysql:1.2.3 .
+rm -f ./init-schema.sql
+rm -f ./init-data.sql
\ No newline at end of file
diff --git a/docker/orion-ops/Dockerfile b/docker/orion-ops/Dockerfile
index 11227bae..06871448 100644
--- a/docker/orion-ops/Dockerfile
+++ b/docker/orion-ops/Dockerfile
@@ -13,9 +13,9 @@ RUN sed -i 's/#PermitRootLogin.*/PermitRootLogin yes/g' /etc/ssh/sshd_config &&
     ssh-keygen -t ed25519 -P '' -f /etc/ssh/ssh_host_ed25519_key && \
     echo 'root:orionadmin' | chpasswd
 WORKDIR /app
-COPY orion-ops-api/orion-ops-web/target/orion-ops-web-1.2.3.jar /app/app.jar
-COPY orion-ops-vue/dist/index.html /usr/share/nginx/html/
-COPY orion-ops-vue/dist /usr/share/nginx/html/ops
-ADD docker/orion-ops/entrypoint.sh /app/entrypoint.sh
-ADD docker/orion-ops/nginx.conf /etc/nginx/conf.d
+COPY ./orion-ops-web-1.2.3.jar /app/app.jar
+COPY ./dist/index.html /usr/share/nginx/html/
+COPY ./dist /usr/share/nginx/html/ops
+ADD ./entrypoint.sh /app/entrypoint.sh
+ADD ./nginx.conf /etc/nginx/conf.d
 ENTRYPOINT [ "sh", "/app/entrypoint.sh" ]
diff --git a/docker/orion-ops/build.sh b/docker/orion-ops/build.sh
new file mode 100644
index 00000000..1c788f2f
--- /dev/null
+++ b/docker/orion-ops/build.sh
@@ -0,0 +1,5 @@
+mv ../../orion-ops-api/orion-ops-web/target/orion-ops-web-1.2.3.jar ./
+mv ../../orion-ops-vue/dist ./
+docker build -t orion-ops:1.2.3 .
+rm -f ./orion-ops-web-1.2.3.jar
+rm -f ../../orion-ops-vue/dist ./dist