Browse Source

1.升级,修复compose配置文件错误

dev_shibei_match
wxz 5 years ago
parent
commit
8fcba0f981
  1. 2
      epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml
  2. 10
      epmet-module/epmet-oss/epmet-oss-server/pom.xml

2
epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml

@ -3,7 +3,7 @@ services:
epmet-oss-server: epmet-oss-server:
container_name: epmet-oss-server-dev container_name: epmet-oss-server-dev
# image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-oss-server:0.3.2 # image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-oss-server:0.3.2
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:0.3.4 image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:0.3.6
ports: ports:
- "8083:8083" - "8083:8083"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

10
epmet-module/epmet-oss/epmet-oss-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.5</version> <version>0.3.6</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-oss</artifactId> <artifactId>epmet-oss</artifactId>
@ -120,9 +120,9 @@
<profiles> <profiles>
<profile> <profile>
<id>dev-local</id> <id>dev-local</id>
<activation> <!--<activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation> </activation>-->
<properties> <properties>
<server.port>8083</server.port> <server.port>8083</server.port>
<spring.profiles.active>dev</spring.profiles.active> <spring.profiles.active>dev</spring.profiles.active>
@ -150,9 +150,9 @@
</profile> </profile>
<profile> <profile>
<id>dev</id> <id>dev</id>
<!--<activation> <activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation>--> </activation>
<properties> <properties>
<server.port>8083</server.port> <server.port>8083</server.port>
<spring.profiles.active>dev</spring.profiles.active> <spring.profiles.active>dev</spring.profiles.active>

Loading…
Cancel
Save