diff --git a/.gitignore b/.gitignore index 57b203d..60af490 100644 --- a/.gitignore +++ b/.gitignore @@ -86,6 +86,3 @@ hs_err_pid* .settings/ .classpath .project -.vscode/settings.json - -.vscode/ \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 06f56df..78519e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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}/ diff --git a/docker-compose.yml b/build/docker-compose.yml similarity index 85% rename from docker-compose.yml rename to build/docker-compose.yml index e2d0d54..bbf65bf 100644 --- a/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" diff --git a/docker/bin/docker-entrypoint.sh b/build/docker/bin/docker-entrypoint.sh similarity index 100% rename from docker/bin/docker-entrypoint.sh rename to build/docker/bin/docker-entrypoint.sh diff --git a/docker/conf/cache.properties b/build/docker/conf/cache.properties similarity index 100% rename from docker/conf/cache.properties rename to build/docker/conf/cache.properties diff --git a/docker/conf/database.properties b/build/docker/conf/database.properties similarity index 100% rename from docker/conf/database.properties rename to build/docker/conf/database.properties diff --git a/docker/conf/logback.xml b/build/docker/conf/logback.xml similarity index 100% rename from docker/conf/logback.xml rename to build/docker/conf/logback.xml diff --git a/docker/conf/mail.properties b/build/docker/conf/mail.properties similarity index 100% rename from docker/conf/mail.properties rename to build/docker/conf/mail.properties diff --git a/docker/conf/redis.properties b/build/docker/conf/redis.properties similarity index 57% rename from docker/conf/redis.properties rename to build/docker/conf/redis.properties index bebb8a1..26fc4d8 100644 --- a/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 \ No newline at end of file +redis.channels=/webapp,/probe,/auth \ No newline at end of file diff --git a/src/main/resources/local/redis.properties b/src/main/resources/local/redis.properties index bebb8a1..26fc4d8 100644 --- 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 \ No newline at end of file +redis.channels=/webapp,/probe,/auth \ No newline at end of file