改进容器部署脚本，支持一键部署

docker/.env

@@ -0,0 +1 @@
+COMPOSE_PROJECT_NAME=ruoyi

docker/.gitignore

@@ -0,0 +1,2 @@
+*.jar
+*.sql

docker/copy.sh

@@ -6,11 +6,19 @@ usage() {
 	exit 1
 }
 
+# build 
+
+cd ../ruoyi-ui
+npm install --registry=https://registry.npmmirror.com
+npm run build:prod
+cd ..
+mvn clean package -Dmaven.test.skip=true
+cd docker
 
 # copy sql
 echo "begin copy sql "
 cp ../sql/ry_20210908.sql ./mysql/db
-cp ../sql/ry_config_20220114.sql ./mysql/db
+cp ../sql/ry_config_20220510.sql ./mysql/db
 
 # copy html
 echo "begin copy html "

docker/deploy.sh

@@ -26,7 +26,9 @@ port(){
 
 # 启动基础环境（必须）
 base(){
-	docker-compose up -d ruoyi-mysql ruoyi-redis ruoyi-nacos
+	docker-compose up -d ruoyi-mysql 
+	docker-compose up -d ruoyi-redis
+	docker-compose up -d ruoyi-nacos
 }
 
 # 启动程序模块（必须）

docker/docker-compose.yml

@@ -1,140 +1,145 @@
-version : '3.8'
-services:
-  ruoyi-nacos:
-    container_name: ruoyi-nacos
-    image: nacos/nacos-server
-    build:
-      context: ./nacos
-    environment:
-      - MODE=standalone
-    volumes:
-      - ./nacos/logs/:/home/nacos/logs
-      - ./nacos/conf/application.properties:/home/nacos/conf/application.properties
-    ports:
-      - "8848:8848"
-      - "9848:9848"
-      - "9849:9849"
-    depends_on:
-      - ruoyi-mysql
-  ruoyi-mysql:
-    container_name: ruoyi-mysql
-    image: mysql:5.7
-    build:
-      context: ./mysql
-    ports:
-      - "3306:3306"
-    volumes:
-      - ./mysql/conf:/etc/mysql/conf.d
-      - ./mysql/logs:/logs
-      - ./mysql/data:/var/lib/mysql
-    command: [
-          'mysqld',
-          '--innodb-buffer-pool-size=80M',
-          '--character-set-server=utf8mb4',
-          '--collation-server=utf8mb4_unicode_ci',
-          '--default-time-zone=+8:00',
-          '--lower-case-table-names=1'
-        ]
-    environment:
-      MYSQL_DATABASE: 'ry-cloud'
-      MYSQL_ROOT_PASSWORD: password
-  ruoyi-redis:
-    container_name: ruoyi-redis
-    image: redis
-    build:
-      context: ./redis
-    ports:
-      - "6379:6379"
-    volumes:
-      - ./redis/conf/redis.conf:/home/ruoyi/redis/redis.conf
-      - ./redis/data:/data
-    command: redis-server /home/ruoyi/redis/redis.conf
-  ruoyi-nginx:
-    container_name: ruoyi-nginx
-    image: nginx
-    build:
-      context: ./nginx
-    ports:
-      - "80:80"
-    volumes:
-      - ./nginx/html/dist:/home/ruoyi/projects/ruoyi-ui
-      - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf
-      - ./nginx/logs:/var/log/nginx
-      - ./nginx/conf.d:/etc/nginx/conf.d
-    depends_on:
-      - ruoyi-gateway
-    links:
-      - ruoyi-gateway
-  ruoyi-gateway:
-    container_name: ruoyi-gateway
-    build:
-      context: ./ruoyi/gateway
-      dockerfile: dockerfile
-    ports:
-      - "8080:8080"
-    depends_on:
-      - ruoyi-redis
-    links:
-      - ruoyi-redis
-  ruoyi-auth:
-    container_name: ruoyi-auth
-    build:
-      context: ./ruoyi/auth
-      dockerfile: dockerfile
-    ports:
-      - "9200:9200"
-    depends_on:
-      - ruoyi-redis
-    links:
-      - ruoyi-redis
-  ruoyi-modules-system:
-    container_name: ruoyi-modules-system
-    build:
-      context: ./ruoyi/modules/system
-      dockerfile: dockerfile
-    ports:
-      - "9201:9201"
-    depends_on:
-      - ruoyi-redis
-      - ruoyi-mysql
-    links:
-      - ruoyi-redis
-      - ruoyi-mysql
-  ruoyi-modules-gen:
-    container_name: ruoyi-modules-gen
-    build:
-      context: ./ruoyi/modules/gen
-      dockerfile: dockerfile
-    ports:
-      - "9202:9202"
-    depends_on:
-      - ruoyi-mysql
-    links:
-      - ruoyi-mysql
-  ruoyi-modules-job:
-    container_name: ruoyi-modules-job
-    build:
-      context: ./ruoyi/modules/job
-      dockerfile: dockerfile
-    ports:
-      - "9203:9203"
-    depends_on:
-      - ruoyi-mysql
-    links:
-      - ruoyi-mysql
-  ruoyi-modules-file:
-    container_name: ruoyi-modules-file
-    build:
-      context: ./ruoyi/modules/file
-      dockerfile: dockerfile
-    ports:
-      - "9300:9300"
-    volumes:
-    - ./ruoyi/uploadPath:/home/ruoyi/uploadPath
-  ruoyi-visual-monitor:
-    container_name: ruoyi-visual-monitor
-    build:
-      context: ./ruoyi/visual/monitor
-      dockerfile: dockerfile
-    ports:
-      - "9100:9100"
+services:
+  ruoyi-nacos:
+    image: nacos/nacos-server:v2.0.4
+    container_name: nacos-standalone-mysql
+    env_file:
+      - ./env/nacos-standlone-mysql.env
+    volumes:
+      - ./nacos/logs/:/home/nacos/logs
+      - ./nacos/init.d/custom.properties:/home/nacos/init.d/custom.properties
+    ports:
+      - "8848:8848"
+      - "9848:9848"
+      - "9555:9555"
+    depends_on:
+      - ruoyi-mysql
+    restart: on-failure
+  # nacos-mysql:
+  #   container_name: mysql
+  #   image: nacos/nacos-mysql:5.7
+  #   env_file:
+  #     - ./env/nacos-mysql.env
+  #   volumes:
+  #     - ./nacos-mysql:/var/lib/mysql
+  #   ports:
+  #     - "3307:3306"
+  ruoyi-mysql:
+    container_name: ruoyi-mysql
+    build:
+      context: ./mysql
+    ports:
+      - "3306:3306"
+    volumes:
+      - ./mysql/conf:/etc/mysql/conf.d
+      - ./mysql/data:/var/lib/mysql
+    command: [
+          'mysqld',
+          '--innodb-buffer-pool-size=80M',
+          '--character-set-server=utf8mb4',
+          '--collation-server=utf8mb4_unicode_ci',
+          '--default-time-zone=+8:00',
+          '--lower-case-table-names=1'
+        ]
+    environment:
+      MYSQL_DATABASE: 'ry-cloud'
+      MYSQL_ROOT_PASSWORD: password
+  ruoyi-redis:
+    container_name: ruoyi-redis
+    image: redis
+    ports:
+      - "6379:6379"
+    volumes:
+      - ./redis/conf/redis.conf:/home/ruoyi/redis/redis.conf
+      - ./redis/data:/data
+    command: redis-server /home/ruoyi/redis/redis.conf
+  ruoyi-nginx:
+    container_name: ruoyi-nginx
+    build :
+      context: ./nginx
+    ports:
+      - "80:80"
+    volumes:
+      - ./nginx/logs:/var/log/nginx
+    depends_on:
+      - ruoyi-gateway
+    links:
+      - ruoyi-gateway
+  ruoyi-gateway:
+    container_name: ruoyi-gateway
+    build:
+      context: ./ruoyi/gateway
+      dockerfile: dockerfile
+    ports:
+      - "8080:8080"
+    env_file:
+      - ./env/ruoyi-service.env     
+    depends_on:
+      - ruoyi-redis
+      - ruoyi-nacos
+  ruoyi-auth:
+    container_name: ruoyi-auth
+    build:
+      context: ./ruoyi/auth
+      dockerfile: dockerfile
+    env_file:
+      - ./env/ruoyi-service.env     
+    depends_on:
+      - ruoyi-redis
+      - ruoyi-nacos
+    ports:
+      - "9200:9200"
+  ruoyi-modules-system:
+    container_name: ruoyi-modules-system
+    build:
+      context: ./ruoyi/modules/system
+      dockerfile: dockerfile
+    env_file:
+      - ./env/ruoyi-service.env     
+    depends_on:
+      - ruoyi-redis
+      - ruoyi-mysql
+      - ruoyi-nacos            
+    ports:
+      - "9201:9201"
+  ruoyi-modules-gen:
+    container_name: ruoyi-modules-gen
+    build:
+      context: ./ruoyi/modules/gen
+      dockerfile: dockerfile
+    env_file:
+      - ./env/ruoyi-service.env     
+    depends_on:
+      - ruoyi-redis
+      - ruoyi-mysql
+      - ruoyi-nacos
+    ports:
+      - "9202:9202"
+  ruoyi-modules-job:
+    container_name: ruoyi-modules-job
+    build:
+      context: ./ruoyi/modules/job
+      dockerfile: dockerfile
+    ports:
+      - "9203:9203"
+    env_file:
+      - ./env/ruoyi-service.env     
+    depends_on:
+      - ruoyi-redis
+      - ruoyi-mysql
+      - ruoyi-nacos
+  ruoyi-modules-file:
+    container_name: ruoyi-modules-file
+    build:
+      context: ./ruoyi/modules/file
+      dockerfile: dockerfile
+    ports:
+      - "9300:9300"
+    volumes:
+    - ./ruoyi/uploadPath:/home/ruoyi/uploadPath
+  ruoyi-visual-monitor:
+    container_name: ruoyi-visual-monitor
+    build:
+      context: ./ruoyi/visual/monitor
+      dockerfile: dockerfile
+    ports:
+      - "9100:9100"

docker/env/nacos-mysql.env

@@ -0,0 +1,4 @@
+MYSQL_ROOT_PASSWORD=root
+MYSQL_DATABASE=nacos_devtest
+MYSQL_USER=nacos
+MYSQL_PASSWORD=nacos

docker/env/nacos-standlone-mysql.env

@@ -0,0 +1,9 @@
+PREFER_HOST_MODE=hostname
+MODE=standalone
+SPRING_DATASOURCE_PLATFORM=mysql
+MYSQL_SERVICE_HOST=ruoyi-mysql
+MYSQL_SERVICE_DB_NAME=ry-config
+MYSQL_SERVICE_PORT=3306
+MYSQL_SERVICE_USER=root
+MYSQL_SERVICE_PASSWORD=password
+MYSQL_SERVICE_DB_PARAM=characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false

docker/env/ruoyi-service.env

@@ -0,0 +1 @@
+NACOS_SERVER=ruoyi-nacos:8848

docker/mysql/dockerfile

@@ -3,5 +3,6 @@ FROM mysql:5.7
 # author
 MAINTAINER ruoyi
 
+
 # 执行sql脚本
 ADD ./db/*.sql /docker-entrypoint-initdb.d/

docker/nginx/conf.d/default.conf

@@ -0,0 +1,23 @@
+server {
+    listen       80;
+    server_name  localhost;
+
+    location / {
+      root   /home/ruoyi/projects/ruoyi-ui;
+      try_files $uri $uri/ /index.html;
+      index  index.html index.htm;
+    }
+
+    location /prod-api/{
+      proxy_set_header Host $http_host;
+      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://ruoyi-gateway:8080/;
+    }
+
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   html;
+    }
+}

docker/nginx/dockerfile

@@ -3,13 +3,13 @@ FROM nginx
 # author
 MAINTAINER ruoyi
 
-# 挂载目录
-VOLUME /home/ruoyi/projects/ruoyi-ui
 # 创建目录
-RUN mkdir -p /home/ruoyi/projects/ruoyi-ui
+# RUN mkdir -p /home/ruoyi/projects/ruoyi-ui
 # 指定路径
 WORKDIR /home/ruoyi/projects/ruoyi-ui
 # 复制conf文件到路径
-COPY ./conf/nginx.conf /etc/nginx/nginx.conf
+COPY ./conf.d/default.conf /etc/nginx/conf.d/default.conf
 # 复制html文件到路径
 COPY ./html/dist /home/ruoyi/projects/ruoyi-ui
+# 挂载目录
+# VOLUME /home/ruoyi/projects/ruoyi-ui