ing

2017-12-15 18:59:04 +09:00 · 2017-12-15 18:59:04 +09:00 · d0bd59a83a
commit d0bd59a83a
parent 55cf7944ed
10 changed files with 5 additions and 8 deletions
--- a/.gitignore
+++ b/.gitignore
@ -86,6 +86,3 @@ hs_err_pid*
 .settings/
 .classpath
 .project
-.vscode/settings.json
-
-.vscode/
--- a/2
+++ b/2
@ -7,7 +7,7 @@ ENV APP_FILENAME="com.loafle.overflow.overflow_server-1.0.0-SNAPSHOT.jar" \
    APP_CONF_PATH="/opt/conf" \
    PATH="$PATH:/opt/bin"

-ADD docker/bin/*.sh /opt/bin/
+ADD build/docker/bin/*.sh /opt/bin/
 ADD target/lib ${APP_HOME_PATH}/lib
 ADD target/${APP_FILENAME} ${APP_HOME_PATH}/

--- a/build/docker-compose.yml
+++ b/build/docker-compose.yml
@ -6,8 +6,8 @@ services:
     image: docker.loafle.net/overflow/overflow_server:1.0.0-SNAPSHOT
     container_name: overFlow-server
     volumes:
-#       - /service/overflow_server/data/opt/conf:/opt/conf
-        - /home/crusader/Temp/docker/conf:/opt/conf
+      - /service/overflow_server/data/opt/conf:/opt/conf
+        # - /home/crusader/Temp/docker/conf:/opt/conf
     ports:
       - "50006:50006"

--- a/build/docker/bin/docker-entrypoint.sh
+++ b/build/docker/bin/docker-entrypoint.sh
--- a/build/docker/conf/cache.properties
+++ b/build/docker/conf/cache.properties
--- a/build/docker/conf/database.properties
+++ b/build/docker/conf/database.properties
--- a/build/docker/conf/logback.xml
+++ b/build/docker/conf/logback.xml
--- a/build/docker/conf/mail.properties
+++ b/build/docker/conf/mail.properties
--- a/build/docker/conf/redis.properties
+++ b/build/docker/conf/redis.properties
@ -1,4 +1,4 @@
 # Redis
 redis.host=192.168.1.50
 redis.port=6379
-redis.channels=/web,/probe,/auth
+redis.channels=/webapp,/probe,/auth
--- a/src/main/resources/local/redis.properties
+++ b/src/main/resources/local/redis.properties
@ -1,4 +1,4 @@
 # Redis
 redis.host=192.168.1.50
 redis.port=6379
-redis.channels=/web,/probe,/auth
+redis.channels=/webapp,/probe,/auth