diff --git a/Dockerfile b/Dockerfile index 699eef6..aa050d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,5 +24,5 @@ USER spring:spring COPY --from=build /workspace/build/libs/*.jar app.jar -EXPOSE 8080 +EXPOSE 8080 8081 ENTRYPOINT ["java", "-XX:MaxRAMPercentage=75.0", "-jar", "app.jar"] diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index 1a50c48..323f6fa 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -14,6 +14,7 @@ services: required: false ports: - "80:${APP_PORT}" + - "127.0.0.1:${MANAGEMENT_PORT:-8081}:8081" env_file: .env environment: DB_URL: jdbc:postgresql://${DB_HOST}:5432/${DB_NAME} @@ -25,7 +26,7 @@ services: mem_limit: 768m logging: *default-logging healthcheck: - test: ["CMD", "bash", "-c", "exec 3<>/dev/tcp/localhost/8080; echo -e 'GET /actuator/health HTTP/1.0\r\n\r\n' >&3; grep -q UP <&3"] + test: ["CMD", "bash", "-c", "exec 3<>/dev/tcp/localhost/8081; echo -e 'GET /actuator/health HTTP/1.0\r\n\r\n' >&3; grep -q UP <&3"] interval: 30s timeout: 5s retries: 3 @@ -49,7 +50,7 @@ services: POSTGRES_USER: ${DB_USER} POSTGRES_PASSWORD: ${DB_PASSWORD} volumes: - - pgdata:/var/lib/postgresql/data + - /data/postgres:/var/lib/postgresql/data mem_limit: 384m logging: *default-logging healthcheck: @@ -64,15 +65,11 @@ services: restart: always command: ["redis-server", "--maxmemory", "64mb", "--maxmemory-policy", "noeviction", "--appendonly", "yes"] volumes: - - redisdata:/data + - /data/redis:/data mem_limit: 128m logging: *default-logging healthcheck: test: ["CMD", "redis-cli", "ping"] interval: 30s timeout: 3s - retries: 3 - -volumes: - pgdata: - redisdata: \ No newline at end of file + retries: 3 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index a0a7835..ea322c8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -34,6 +34,7 @@ services: SWAGGER_ENABLED: ${SWAGGER_ENABLED:-true} ports: - "${APP_PORT:-8080}:8080" + - "127.0.0.1:${MANAGEMENT_PORT:-8081}:8081" restart: unless-stopped volumes: diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 3cb1323..7494aa1 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -32,6 +32,8 @@ springdoc: default-produces-media-type: application/json management: + server: + port: 8081 endpoints: web: exposure: