Commit 80e53610 authored by liqin's avatar liqin 💬

bug fixed

parent cdbb3a3a
...@@ -5,7 +5,7 @@ VOLUME /opt ...@@ -5,7 +5,7 @@ VOLUME /opt
ARG JAR_FILE ARG JAR_FILE
#ADD ./project-web-api/target/data-station.jar data-station.jar #ADD ./project-web-api/target/data-station.jar data-station.jar
COPY ./wisenergy-web-admin/target/shop-mall-1.0.0-SNAPSHOT.jar /opt/ COPY ./wisenergy-web-admin/target/shop-mall.jar /opt/
ADD hosts /tmp ADD hosts /tmp
WORKDIR /opt WORKDIR /opt
...@@ -14,6 +14,6 @@ ENV TZ=Asia/Shanghai ...@@ -14,6 +14,6 @@ ENV TZ=Asia/Shanghai
#ENV TZ=PRC #ENV TZ=PRC
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
CMD cat /tmp/hosts >> /etc/hosts CMD cat /tmp/hosts >> /etc/hosts
CMD ["java","-Djava.security.egd=file:/dev/./urandom","-jar","shop-mall-1.0.0-SNAPSHOT.jar"] CMD ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.profiles.active=test","-jar","shop-mall.jar"]
#CMD cat /etc/hosts #CMD cat /etc/hosts
#RUN/ENTRYPOINT/CMD nohup java -jar -Xmx512m -Xms512m -Xss256k -XX:MaxDirectMemorySize=512m -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -XX:G1ReservePercent=25 -XX:InitiatingHeapOccupancyPercent=40 -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dfile.encoding=UTF-8 -Djava.security.egd=file:/dev/./urandom -Dserver.port=8090 data-station.jar > data-station.log 2>&1 & #RUN/ENTRYPOINT/CMD nohup java -jar -Xmx512m -Xms512m -Xss256k -XX:MaxDirectMemorySize=512m -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -XX:G1ReservePercent=25 -XX:InitiatingHeapOccupancyPercent=40 -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dfile.encoding=UTF-8 -Djava.security.egd=file:/dev/./urandom -Dserver.port=8090 data-station.jar > data-station.log 2>&1 &
\ No newline at end of file
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<!-- MAVEN构建 --> <!-- MAVEN构建 -->
<build> <build>
<finalName>shop-mall-${moduleVersion.wisenergy-web-admin}</finalName> <finalName>shop-mall</finalName>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment