From 294911b4fa52fe0a07496b808231962aa01205a2 Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Tue, 27 Feb 2024 18:49:55 +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              | 3 ---
 docker/orion-ops-pro/Dockerfile | 8 ++++----
 docker/orion-ops-pro/build.sh   | 3 +++
 docs/quickstart/install.md      | 2 +-
 orion-ops-ui/components.d.ts    | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 docker/orion-ops-pro/build.sh

diff --git a/docker-compose.yml b/docker-compose.yml
index ddd19be3..7d5dc5e1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,9 +1,6 @@
 version: '3.3'
 services:
   orion-ops-pro:
-    #    build:
-    #      context: .
-    #      dockerfile: docker/orion-ops-pro/Dockerfile
     image: orion-ops-pro:1.0.0-beta.1
     ports:
       - 1081:80
diff --git a/docker/orion-ops-pro/Dockerfile b/docker/orion-ops-pro/Dockerfile
index 0065f5d4..f9868d3b 100644
--- a/docker/orion-ops-pro/Dockerfile
+++ b/docker/orion-ops-pro/Dockerfile
@@ -8,8 +8,8 @@ RUN \
 RUN apk add openjdk8
 RUN rm -rf /etc/nginx/conf.d/*
 WORKDIR /app
-COPY ../../orion-ops-launch/target/orion-ops-launch.jar /app/app.jar
-COPY ../../orion-ops-ui/dist /usr/share/nginx/html
-COPY ../../docker/orion-ops-pro/entrypoint.sh /app/entrypoint.sh
-COPY ../../docker/orion-ops-pro/nginx.conf /etc/nginx/conf.d
+COPY ./orion-ops-launch.jar /app/app.jar
+COPY ./dist /usr/share/nginx/html
+COPY ./entrypoint.sh /app/entrypoint.sh
+COPY ./nginx.conf /etc/nginx/conf.d
 ENTRYPOINT [ "sh", "/app/entrypoint.sh" ]
diff --git a/docker/orion-ops-pro/build.sh b/docker/orion-ops-pro/build.sh
new file mode 100644
index 00000000..80063306
--- /dev/null
+++ b/docker/orion-ops-pro/build.sh
@@ -0,0 +1,3 @@
+mv ../../orion-ops-launch/target/orion-ops-launch.jar ./
+mv ../../orion-ops-ui/dist/ ./
+docker build -t orion-ops-pro:1.0.0-beta.1 .
diff --git a/docs/quickstart/install.md b/docs/quickstart/install.md
index cb601237..1509c2b1 100644
--- a/docs/quickstart/install.md
+++ b/docs/quickstart/install.md
@@ -118,7 +118,7 @@ server {
 ### 部署
 
 ```
-复制 orion-ops-pro/orion-ops-ui 到 /usr/share/nginx/html
+复制 orion-ops-pro/orion-ops-ui/dist 到 /usr/share/nginx/html
 复制 orion-ops-pro/orion-ops-launch/target/orion-ops-launch.jar 到 /data/orion
 # 启动后台服务
 nohup java -jar orion-ops-launch.jar --spring.profiles.active=prod 2>&1 &
diff --git a/orion-ops-ui/components.d.ts b/orion-ops-ui/components.d.ts
index 24f3a4c2..524ea406 100644
--- a/orion-ops-ui/components.d.ts
+++ b/orion-ops-ui/components.d.ts
@@ -3,7 +3,7 @@
 // @ts-nocheck
 // Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
-import '@vue/runtime-core';
+import '@vue/runtime-core'
 
 export {}