update 配置 monitor-admin docker编排
This commit is contained in:
parent
1c11d7ccc1
commit
43486f2f41
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
#使用说明,用来提示输入参数
|
#使用说明,用来提示输入参数
|
||||||
usage() {
|
usage() {
|
||||||
echo "Usage: sh 执行脚本.sh [port|mount|base|start|stop|stopall|rm|rmiNoneTag]"
|
echo "Usage: sh 执行脚本.sh [port|mount|monitor|base|start|stop|stopall|rm|rmiNoneTag]"
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -27,6 +27,11 @@ base(){
|
||||||
docker-compose up -d mysql nginx-web redis
|
docker-compose up -d mysql nginx-web redis
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#启动基础模块
|
||||||
|
monitor(){
|
||||||
|
docker-compose up -d ruoyi-monitor-admin
|
||||||
|
}
|
||||||
|
|
||||||
#启动程序模块
|
#启动程序模块
|
||||||
start(){
|
start(){
|
||||||
docker-compose up -d ruoyi-server1 ruoyi-server2
|
docker-compose up -d ruoyi-server1 ruoyi-server2
|
||||||
|
@ -63,6 +68,9 @@ case "$1" in
|
||||||
"base")
|
"base")
|
||||||
base
|
base
|
||||||
;;
|
;;
|
||||||
|
"monitor")
|
||||||
|
monitor
|
||||||
|
;;
|
||||||
"start")
|
"start")
|
||||||
start
|
start
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -101,6 +101,16 @@ services:
|
||||||
ruoyi_net:
|
ruoyi_net:
|
||||||
ipv4_address: 172.30.0.61
|
ipv4_address: 172.30.0.61
|
||||||
|
|
||||||
|
ruoyi-monitor-admin:
|
||||||
|
image: "ruoyi/ruoyi-monitor-admin:2.4.0"
|
||||||
|
environment:
|
||||||
|
- TZ=Asia/Shanghai
|
||||||
|
privileged: true
|
||||||
|
restart: always
|
||||||
|
networks:
|
||||||
|
ruoyi_net:
|
||||||
|
ipv4_address: 172.30.0.90
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
ruoyi_net:
|
ruoyi_net:
|
||||||
driver: bridge
|
driver: bridge
|
||||||
|
|
|
@ -26,6 +26,10 @@ http {
|
||||||
server 172.30.0.61:8080;
|
server 172.30.0.61:8080;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
upstream monitor-admin {
|
||||||
|
server 172.30.0.90:9090;
|
||||||
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
listen 80;
|
listen 80;
|
||||||
server_name localhost;
|
server_name localhost;
|
||||||
|
@ -62,7 +66,7 @@ http {
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
proxy_set_header REMOTE-HOST $remote_addr;
|
proxy_set_header REMOTE-HOST $remote_addr;
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
proxy_pass http://server/admin/;
|
proxy_pass http://monitor-admin/admin/;
|
||||||
}
|
}
|
||||||
|
|
||||||
error_page 500 502 503 504 /50x.html;
|
error_page 500 502 503 504 /50x.html;
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -34,7 +34,7 @@
|
||||||
<datasource.version>3.4.0</datasource.version>
|
<datasource.version>3.4.0</datasource.version>
|
||||||
|
|
||||||
<!-- docker 配置 -->
|
<!-- docker 配置 -->
|
||||||
<docker.registry.url>localhost</docker.registry.url>
|
<docker.registry.url>192.168.31.240</docker.registry.url>
|
||||||
<docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host>
|
<docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host>
|
||||||
<docker.namespace>ruoyi</docker.namespace>
|
<docker.namespace>ruoyi</docker.namespace>
|
||||||
<docker.plugin.version>1.2.0</docker.plugin.version>
|
<docker.plugin.version>1.2.0</docker.plugin.version>
|
||||||
|
|
|
@ -88,7 +88,7 @@
|
||||||
<artifactId>docker-maven-plugin</artifactId>
|
<artifactId>docker-maven-plugin</artifactId>
|
||||||
<version>${docker.plugin.version}</version>
|
<version>${docker.plugin.version}</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<imageName>${docker.namespace}/${project.artifactId}:${project.version}</imageName>
|
<imageName>${docker.namespace}/ruoyi-server:${project.version}</imageName>
|
||||||
<dockerDirectory>${project.basedir}</dockerDirectory>
|
<dockerDirectory>${project.basedir}</dockerDirectory>
|
||||||
<dockerHost>${docker.registry.host}</dockerHost>
|
<dockerHost>${docker.registry.host}</dockerHost>
|
||||||
<registryUrl>${docker.registry.url}</registryUrl>
|
<registryUrl>${docker.registry.url}</registryUrl>
|
||||||
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
FROM anapsix/alpine-java:8_server-jre_unlimited
|
||||||
|
|
||||||
|
MAINTAINER Lion Li
|
||||||
|
|
||||||
|
RUN mkdir -p /ruoyi/monitor
|
||||||
|
|
||||||
|
WORKDIR /ruoyi/monitor
|
||||||
|
|
||||||
|
EXPOSE 9090
|
||||||
|
|
||||||
|
ADD ./target/ruoyi-monitor-admin.jar ./app.jar
|
||||||
|
|
||||||
|
ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
|
|
@ -30,4 +30,44 @@
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
<finalName>${project.artifactId}</finalName>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||||
|
<version>${spring-boot.version}</version>
|
||||||
|
<configuration>
|
||||||
|
<fork>true</fork> <!-- 如果没有该配置,devtools不会生效 -->
|
||||||
|
</configuration>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<goals>
|
||||||
|
<goal>repackage</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.spotify</groupId>
|
||||||
|
<artifactId>docker-maven-plugin</artifactId>
|
||||||
|
<version>${docker.plugin.version}</version>
|
||||||
|
<configuration>
|
||||||
|
<imageName>${docker.namespace}/${project.artifactId}:${project.version}</imageName>
|
||||||
|
<dockerDirectory>${project.basedir}</dockerDirectory>
|
||||||
|
<dockerHost>${docker.registry.host}</dockerHost>
|
||||||
|
<registryUrl>${docker.registry.url}</registryUrl>
|
||||||
|
<serverId>${docker.registry.url}</serverId>
|
||||||
|
<resources>
|
||||||
|
<resource>
|
||||||
|
<targetPath>/</targetPath>
|
||||||
|
<directory>${project.build.directory}</directory>
|
||||||
|
<include>${project.build.finalName}.jar</include>
|
||||||
|
</resource>
|
||||||
|
</resources>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
|
@ -7,5 +7,8 @@ ENV = 'development'
|
||||||
# 若依管理系统/开发环境
|
# 若依管理系统/开发环境
|
||||||
VUE_APP_BASE_API = '/dev-api'
|
VUE_APP_BASE_API = '/dev-api'
|
||||||
|
|
||||||
|
# 监控地址
|
||||||
|
VUE_APP_MONITRO_ADMIN = 'http://localhost:9090/admin/login'
|
||||||
|
|
||||||
# 路由懒加载
|
# 路由懒加载
|
||||||
VUE_CLI_BABEL_TRANSPILE_MODULES = true
|
VUE_CLI_BABEL_TRANSPILE_MODULES = true
|
||||||
|
|
|
@ -4,5 +4,8 @@ VUE_APP_TITLE = RuoYi-Vue-Plus后台管理系统
|
||||||
# 生产环境配置
|
# 生产环境配置
|
||||||
ENV = 'production'
|
ENV = 'production'
|
||||||
|
|
||||||
|
# 监控地址
|
||||||
|
VUE_APP_MONITRO_ADMIN = '/admin/login'
|
||||||
|
|
||||||
# 若依管理系统/生产环境
|
# 若依管理系统/生产环境
|
||||||
VUE_APP_BASE_API = '/prod-api'
|
VUE_APP_BASE_API = '/prod-api'
|
||||||
|
|
|
@ -6,5 +6,8 @@ NODE_ENV = production
|
||||||
# 测试环境配置
|
# 测试环境配置
|
||||||
ENV = 'staging'
|
ENV = 'staging'
|
||||||
|
|
||||||
|
# 监控地址
|
||||||
|
VUE_APP_MONITRO_ADMIN = '/admin/login'
|
||||||
|
|
||||||
# 若依管理系统/测试环境
|
# 若依管理系统/测试环境
|
||||||
VUE_APP_BASE_API = '/stage-api'
|
VUE_APP_BASE_API = '/stage-api'
|
||||||
|
|
|
@ -1,26 +1,16 @@
|
||||||
<template>
|
<template>
|
||||||
<div v-loading="loading" :style="'height:'+ height">
|
<i-frame :src="url" />
|
||||||
<iframe :src="src" frameborder="no" style="width: 100%;height: 100%" scrolling="auto" />
|
|
||||||
</div>
|
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
|
import iFrame from "@/components/iFrame/index";
|
||||||
export default {
|
export default {
|
||||||
name: "Admin",
|
name: "Admin",
|
||||||
|
components: { iFrame },
|
||||||
data() {
|
data() {
|
||||||
|
console.log(process.env)
|
||||||
return {
|
return {
|
||||||
src: "http://localhost:9090/admin/login",
|
url: process.env.VUE_APP_MONITRO_ADMIN
|
||||||
height: document.documentElement.clientHeight - 94.5 + "px;",
|
|
||||||
loading: true
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
mounted: function() {
|
|
||||||
setTimeout(() => {
|
|
||||||
this.loading = false;
|
|
||||||
}, 230);
|
|
||||||
const that = this;
|
|
||||||
window.onresize = function temp() {
|
|
||||||
that.height = document.documentElement.clientHeight - 94.5 + "px;";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
Loading…
Reference in New Issue