浏览代码

fix: 删除docker-compose包,docker-compose使用项目根目录的配置

gaoyoulong 1 年之前
父节点
当前提交
183a58c3d4
共有 3 个文件被更改,包括 0 次插入120 次删除
  1. 0 26
      docker-compose/docker-compose-iita.yml
  2. 0 75
      docker-compose/docker-compose.yml
  3. 0 19
      docker-compose/docker.env

+ 0 - 26
docker-compose/docker-compose-iita.yml

@@ -1,26 +0,0 @@
-version: "3"
-services:
-  iita-app:
-    container_name: iita-app
-    # 改成你自己的镜像
-    image: 75509151/iita-app:0.5.4
-    # 构建镜像时使用
-    build:
-      context: ""
-      dockerfile: Dockerfile
-
-    restart: always
-    # 使用主机端口
-    network_mode: "host"
-    volumes:
-#      - ./admin-service.jar:/admin-service.jar
-      - /app/data/components:/app/data/components
-      - /app/data/converters:/app/data/converters
-      - /app/config:/app/config/
-      - /app/log:/app/log/
-    command:
-      - /bin/sh
-      - -c
-      - |
-        echo "Asia/Shanghai" > /etc/timezone
-        java -DdisabledEmbeddedRedis=true -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -server -Xmx512m -Xms512m -Xmn256m -Xss256k -Dlogging.path=/app/log/ -Dspring.config.location=/app/config/  -jar /app/app.jar

+ 0 - 75
docker-compose/docker-compose.yml

@@ -1,75 +0,0 @@
-version: "3.4"
-
-services:
-  mysql:
-    container_name: iot-mysql
-    image: mysql:8
-    restart: unless-stopped
-    tty: true
-    ports:
-      - "3306:3306"
-    environment:
-      MYSQL_DATABASE: ${MYSQL_DATABASE:-iotkit}
-      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-123456}
-    volumes:
-      - mysql:/var/lib/mysql/
-
-
-  redis:
-    container_name: iot-redis
-    image: redis:6-alpine
-    restart: unless-stopped
-    ports:
-      - "6379:6379"
-    volumes:
-      - redis:/data
-
-  server:
-    container_name: iot-server
-    build:
-      context: ./
-    image: iot-server
-    restart: unless-stopped
-    ports:
-      - "8086:8086"
-    environment:
-      # https://github.com/polovyivan/docker-pass-configs-to-container
-      SPRING_PROFILES_ACTIVE: local
-      JAVA_OPTS:
-        ${JAVA_OPTS:-
-        -Xms512m
-        -Xmx512m
-        -Djava.security.egd=file:/dev/./urandom
-        }
-      ARGS:
-        --spring.datasource.dynamic.datasource.master.url=${MASTER_DATASOURCE_URL:-jdbc:mysql://iot-mysql:3306/iotkit?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true}
-        --spring.datasource.dynamic.datasource.master.username=${MASTER_DATASOURCE_USERNAME:-root}
-        --spring.datasource.dynamic.datasource.master.password=${MASTER_DATASOURCE_PASSWORD:-123456}
-        --spring.datasource.dynamic.datasource.slave.url=${SLAVE_DATASOURCE_URL:-jdbc:mysql://iot-mysql:3306/iotkit?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true}
-        --spring.datasource.dynamic.datasource.slave.username=${SLAVE_DATASOURCE_USERNAME:-root}
-        --spring.datasource.dynamic.datasource.slave.password=${SLAVE_DATASOURCE_PASSWORD:-123456}
-        --spring.redis.host=${REDIS_HOST:-iot-redis}
-    depends_on:
-      - redis
-
-  admin:
-    container_name: iot-admin
-    build:
-      context: ./iot-ui-admin
-      args:
-        NODE_ENV:
-          ENV=${NODE_ENV:-production}
-          PUBLIC_PATH=${PUBLIC_PATH:-/}
-          VUE_APP_TITLE=${VUE_APP_TITLE:-openiita管理系统}
-    image: iot-admin
-    restart: unless-stopped
-    ports:
-      - "8080:80"
-    depends_on:
-      - server
-
-volumes:
-  mysql:
-    driver: local
-  redis:
-    driver: local

+ 0 - 19
docker-compose/docker.env

@@ -1,19 +0,0 @@
-## mysql
-MYSQL_DATABASE=iotkit
-MYSQL_ROOT_PASSWORD=123456
-
-## server
-JAVA_OPTS=-Xms512m -Xmx512m -Djava.security.egd=file:/dev/./urandom
-
-MASTER_DATASOURCE_URL=jdbc:mysql://iot-mysql:3306/${MYSQL_DATABASE}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
-MASTER_DATASOURCE_USERNAME=root
-MASTER_DATASOURCE_PASSWORD=${MYSQL_ROOT_PASSWORD}
-SLAVE_DATASOURCE_URL=${MASTER_DATASOURCE_URL}
-SLAVE_DATASOURCE_USERNAME=${MASTER_DATASOURCE_USERNAME}
-SLAVE_DATASOURCE_PASSWORD=${MASTER_DATASOURCE_PASSWORD}
-REDIS_HOST=iot-redis
-
-## admin
-NODE_ENV=production
-PUBLIC_PATH=/
-VUE_APP_TITLE=iot管理系统