update 配置 monitor-admin docker编排

疯狂的狮子li

2021-07-09 43486f2f415be304d741c5f1fc72b45209947c66

update 配置 monitor-admin docker编排

 docker/deploy.sh

@@ -2,7 +2,7 @@

#使用说明，用来提示输入参数
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
}

@@ -25,6 +25,11 @@
#启动基础模块
base(){
    docker-compose up -d mysql nginx-web redis
}

#启动基础模块
monitor(){
    docker-compose up -d ruoyi-monitor-admin
}

#启动程序模块
@@ -63,6 +68,9 @@
"base")
    base
;;
"monitor")
    monitor
;;
"start")
    start
;;

 docker/docker-compose.yml

@@ -101,6 +101,16 @@
      ruoyi_net:
        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:
  ruoyi_net:
    driver: bridge

 docker/nginx/nginx.conf

@@ -26,6 +26,10 @@
        server 172.30.0.61:8080;
    }

    upstream monitor-admin {
        server 172.30.0.90:9090;
    }

    server {
        listen       80;
        server_name  localhost;
@@ -62,7 +66,7 @@
            proxy_set_header X-Real-IP $remote_addr;
            proxy_set_header REMOTE-HOST $remote_addr;
            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;

 pom.xml

@@ -34,7 +34,7 @@
        <datasource.version>3.4.0</datasource.version>

        <!-- 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.namespace>ruoyi</docker.namespace>
        <docker.plugin.version>1.2.0</docker.plugin.version>

 ruoyi-admin/pom.xml

@@ -88,7 +88,7 @@
                <artifactId>docker-maven-plugin</artifactId>
                <version>${docker.plugin.version}</version>
                <configuration>
                    <imageName>${docker.namespace}/${project.artifactId}:${project.version}</imageName>
                    <imageName>${docker.namespace}/ruoyi-server:${project.version}</imageName>
                    <dockerDirectory>${project.basedir}</dockerDirectory>
                    <dockerHost>${docker.registry.host}</dockerHost>
                    <registryUrl>${docker.registry.url}</registryUrl>

 ruoyi-extend/ruoyi-monitor-admin/Dockerfile

¶Ô±ÈÐÂÎļþ
@@ -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"]

 ruoyi-extend/ruoyi-monitor-admin/pom.xml

@@ -30,4 +30,44 @@
        </dependency>
    </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>

 ruoyi-ui/.env.development

@@ -7,5 +7,8 @@
# è‹¥ä¾ç®¡ç†ç³»ç»Ÿ/开发环境
VUE_APP_BASE_API = '/dev-api'

# ç›‘控地址
VUE_APP_MONITRO_ADMIN = 'http://localhost:9090/admin/login'

# è·¯ç”±æ‡’加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true

 ruoyi-ui/.env.production

@@ -4,5 +4,8 @@
# ç”Ÿäº§çŽ¯å¢ƒé…ç½®
ENV = 'production'

# ç›‘控地址
VUE_APP_MONITRO_ADMIN = '/admin/login'

# è‹¥ä¾ç®¡ç†ç³»ç»Ÿ/生产环境
VUE_APP_BASE_API = '/prod-api'

 ruoyi-ui/.env.staging

@@ -6,5 +6,8 @@
# æµ‹è¯•çŽ¯å¢ƒé…ç½®
ENV = 'staging'

# ç›‘控地址
VUE_APP_MONITRO_ADMIN = '/admin/login'

# è‹¥ä¾ç®¡ç†ç³»ç»Ÿ/测试环境
VUE_APP_BASE_API = '/stage-api'

 ruoyi-ui/src/views/monitor/admin/index.vue

@@ -1,26 +1,16 @@
<template>
  <div v-loading="loading" :style="'height:'+ height">
    <iframe :src="src" frameborder="no" style="width: 100%;height: 100%" scrolling="auto" />
  </div>
  <i-frame :src="url" />
</template>
<script>
import iFrame from "@/components/iFrame/index";
export default {
  name: "Admin",
  components: { iFrame },
  data() {
    console.log(process.env)
    return {
      src: "http://localhost:9090/admin/login",
      height: document.documentElement.clientHeight - 94.5 + "px;",
      loading: true
      url: process.env.VUE_APP_MONITRO_ADMIN
    };
  },
  mounted: function() {
    setTimeout(() => {
      this.loading = false;
    }, 230);
    const that = this;
    window.onresize = function temp() {
      that.height = document.documentElement.clientHeight - 94.5 + "px;";
    };
  }
};
</script>