diff --git a/Dockerfile b/Dockerfile index 7a59a15..157ca65 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ FROM primetoninc/jdk:1.8 -RUN mkdir -p /data/gm/config/ -ADD target/gm_tw_admin-1.0-SNAPSHOT.jar /data/gm/gm_tw_admin-1.0-SNAPSHOT.jar +ADD ./target/gm_tw_admin-1.0-SNAPSHOT.jar /data/gm/gm_tw_admin-1.0-SNAPSHOT.jar +ADD ./conf/ /data/gm/conf/ EXPOSE 8888 -ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] +WORKDIR /data/gm/ +CMD ["java","-Dspring.config.location=./conf/application.properties","-jar","./gm_tw_admin-1.0-SNAPSHOT.jar"] diff --git a/conf/application.properties b/conf/application.properties index 23224ea..085bc4c 100644 --- a/conf/application.properties +++ b/conf/application.properties @@ -1,14 +1,13 @@ -spring.thymeleaf.cache=false spring.thymeleaf.content-type=text/html spring.thymeleaf.mode =LEGACYHTML5 -spring.data.mongodb.uri = mongodb://60.1.1.14:27017/ysj_core -spring.data.oldMongodb.uri= mongodb://60.1.1.14:27017 +spring.data.mongodb.uri = mongodb://150.116.94.74:27017/ysj_core +spring.data.oldMongodb.uri= mongodb://150.116.94.74:27017 # redis config -spring.redis.host = 60.1.1.14 +spring.redis.host = 150.116.94.74 spring.redis.port = 6379 -spring.redis.password = +spring.redis.password =redis.ljsd.COM@ spring.redis.expireTime = -1 spring.mvc.static-path-pattern=/**