diff --git a/backend/moment/moment-server/auth/src/main/resources/application.yml b/backend/moment/moment-server/auth/src/main/resources/application.yml index 820dcbcab9..e813d41e4b 100644 --- a/backend/moment/moment-server/auth/src/main/resources/application.yml +++ b/backend/moment/moment-server/auth/src/main/resources/application.yml @@ -17,7 +17,7 @@ eureka: register-with-eureka: true fetch-registry: true service-url: - defaultZone: http://host.docker.internal:8761/eureka + defaultZone: http://wasuphj.synology.me:8761/eureka # defaultZone: http://localhost:8761/eureka # instance: # instance-id: ${spring.application.name}:${spring.application.instance_id:${random.value}} \ No newline at end of file diff --git a/backend/moment/moment-server/core/src/main/resources/application.yml b/backend/moment/moment-server/core/src/main/resources/application.yml index cfbaf0c500..3099ef3e05 100644 --- a/backend/moment/moment-server/core/src/main/resources/application.yml +++ b/backend/moment/moment-server/core/src/main/resources/application.yml @@ -17,7 +17,7 @@ eureka: register-with-eureka: true fetch-registry: true service-url: - defaultZone: http://host.docker.internal:8761/eureka + defaultZone: http://wasuphj.synology.me:8761/eureka # defaultZone: http://localhost:8761/eureka # instance: # instance-id: ${spring.application.name}:${spring.application.instance_id:${random.value}} \ No newline at end of file diff --git a/backend/moment/moment-server/deploy.sh b/backend/moment/moment-server/deploy.sh index ccbbf357a8..fdaed5f78d 100644 --- a/backend/moment/moment-server/deploy.sh +++ b/backend/moment/moment-server/deploy.sh @@ -1,6 +1,15 @@ ssh -tt -p ${SERVER_PORT} ${SERVER_USER}@${SERVER_HOST} -i key.txt -o StrictHostKeyChecking=no << 'ENDSSH' -cd capstone-2024-22/backend/moment/moment-server +# Check if the container is already running +if [ "$(docker ps -q -f name=moment-server)" ]; then + # If the container is running, stop and remove it + docker stop moment-server + docker rm moment-server +fi + +# Pull the latest changes from the repository git pull origin "deploy/v1" + +# Build and start the container docker-compose up --build -d ENDSSH \ No newline at end of file diff --git a/backend/moment/moment-server/eureka/src/main/resources/application.yml b/backend/moment/moment-server/eureka/src/main/resources/application.yml index a9d1cf95bb..8922f55ba8 100644 --- a/backend/moment/moment-server/eureka/src/main/resources/application.yml +++ b/backend/moment/moment-server/eureka/src/main/resources/application.yml @@ -16,5 +16,5 @@ eureka: register-with-eureka: false fetch-registry: false service-url: - defaultZone: http://host.docker.internal:${server.port}/eureka/ + defaultZone: http://wasuphj.synology.me:8761/eureka # defaultZone: http://localhost:${server.port}/eureka/ \ No newline at end of file diff --git a/backend/moment/moment-server/gateway/src/main/resources/application.yml b/backend/moment/moment-server/gateway/src/main/resources/application.yml index 37c4f273a9..9da5062edc 100644 --- a/backend/moment/moment-server/gateway/src/main/resources/application.yml +++ b/backend/moment/moment-server/gateway/src/main/resources/application.yml @@ -68,5 +68,5 @@ eureka: register-with-eureka: true fetch-registry: true service-url: - defaultZone: http://host.docker.internal:8761/eureka + defaultZone: http://wasuphj.synology.me:8761/eureka # defaultZone: http://localhost:8761/eureka diff --git a/backend/moment/moment-server/mail/src/main/resources/application.yml b/backend/moment/moment-server/mail/src/main/resources/application.yml index a8e8b4a34f..dff80514a4 100644 --- a/backend/moment/moment-server/mail/src/main/resources/application.yml +++ b/backend/moment/moment-server/mail/src/main/resources/application.yml @@ -17,7 +17,7 @@ eureka: register-with-eureka: true fetch-registry: true service-url: - defaultZone: http://host.docker.internal:8761/eureka + defaultZone: http://wasuphj.synology.me:8761/eureka # defaultZone: http://localhost:8761/eureka # instance: # instance-id: ${spring.application.name}:${spring.application.instance_id:${random.value}} \ No newline at end of file diff --git a/backend/moment/moment-server/scheduler/src/main/resources/application.yml b/backend/moment/moment-server/scheduler/src/main/resources/application.yml index b78d83fffd..1b7bcf543a 100644 --- a/backend/moment/moment-server/scheduler/src/main/resources/application.yml +++ b/backend/moment/moment-server/scheduler/src/main/resources/application.yml @@ -17,8 +17,8 @@ eureka: register-with-eureka: true fetch-registry: true service-url: -# defaultZone: http://host.docker.internal:8761/eureka - defaultZone: http://localhost:8761/eureka + defaultZone: http://wasuphj.synology.me:8761/eureka +# defaultZone: http://localhost:8761/eureka logging: level: