Browse Source

Merge remote-tracking branch 'epmet/dev_epmet_mix' into dev_epmet_mix

dev
jianjun 4 years ago
parent
commit
f42a673884
  1. 1
      docker-compose-dev.yml
  2. 4
      tduck-api/Dockerfile
  3. 2
      tduck-api/src/main/resources/logback-spring.xml

1
docker-compose-dev.yml

@ -28,6 +28,7 @@ services:
tduck-api: tduck-api:
# build: # build:
# context: ./jeecg-boot-module-system # context: ./jeecg-boot-module-system
network_mode: host
restart: unless-stopped restart: unless-stopped
container_name: tduck-platform-dev container_name: tduck-platform-dev
image: 192.168.1.140:5000/epmet-cloud-dev/tduck-platform:version_placeholder image: 192.168.1.140:5000/epmet-cloud-dev/tduck-platform:version_placeholder

4
tduck-api/Dockerfile

@ -4,10 +4,6 @@ MAINTAINER jeecgos@163.com
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
RUN mkdir -p /jeecg-boot
WORKDIR /jeecg-boot
EXPOSE 8116 EXPOSE 8116
#ADD ./target/jeecg-boot-module-system-2.2.1.jar ./jeecg-boot-module-system-2.2.1.jar #ADD ./target/jeecg-boot-module-system-2.2.1.jar ./jeecg-boot-module-system-2.2.1.jar

2
tduck-api/src/main/resources/logback-spring.xml

@ -2,7 +2,7 @@
<configuration debug="false" scan="false"> <configuration debug="false" scan="false">
<!-- 日志文件地址,项目根目录 --> <!-- 日志文件地址,项目根目录 -->
<property name="log.path" value="./logs/tduck"/> <property name="log.path" value="logs/tduck"/>
<!-- 彩色日志格式 --> <!-- 彩色日志格式 -->
<property name="CONSOLE_LOG_PATTERN" <property name="CONSOLE_LOG_PATTERN"

Loading…
Cancel
Save