diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml index e229d05e..241e27a5 100644 --- a/docker-compose-prod.yml +++ b/docker-compose-prod.yml @@ -24,8 +24,8 @@ services: - MINIO_ACCESS_KEY=${MINIO_ACCESS_KEY} #ID - MINIO_SECRET_KEY=${MINIO_SECRET_KEY} #PASSWORD - MINIO_BUCKET=${MINIO_BUCKET} - - KAFKA_BOOTSTRAP_SERVERS=${PROD_KAFKA_BOOTSTRAP_SERVERS} - - KAFKA_CONSUMER_GROUP_ID=${PROD_KAFKA_CONSUMER_GROUP_ID} + - KAFKA_BOOTSTRAP_SERVERS=${KAFKA_BOOTSTRAP_SERVERS} + - KAFKA_CONSUMER_GROUP_ID=${KAFKA_CONSUMER_GROUP_ID} - JWT_SECRET_KEY=${JWT_SECRET_KEY} - TZ=Asia/Seoul diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 14905cfb..4f5803a0 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -114,7 +114,7 @@ spring: activate: on-profile: local kafka: - bootstrap-servers: ${KAFKA_BOOTSTRAP_SERVERS:kafka:29092} + bootstrap-servers: kafka:29092 producer: key-serializer: org.apache.kafka.common.serialization.StringSerializer value-serializer: org.springframework.kafka.support.serializer.JsonSerializer @@ -153,9 +153,9 @@ spring: ssl: enabled: false kafka: - bootstrap-servers: ${PROD_KAFKA_BOOTSTRAP_SERVERS:localhost:9092} + bootstrap-servers: ${KAFKA_BOOTSTRAP_SERVERS:localhost:9092} consumer: - group-id: ${PROD_KAFKA_CONSUMER_GROUP_ID:devnogi-community-group} + group-id: ${KAFKA_CONSUMER_GROUP_ID:devnogi-community-group} auto-offset-reset: latest key-deserializer: org.apache.kafka.common.serialization.StringDeserializer @@ -198,12 +198,12 @@ spring: port: ${REDIS_PORT:6379} password: ${REDIS_PASSWORD:} kafka: - bootstrap-servers: kafka:29092 + bootstrap-servers: ${KAFKA_BOOTSTRAP_SERVERS:localhost:9092} producer: key-serializer: org.apache.kafka.common.serialization.StringSerializer value-serializer: org.springframework.kafka.support.serializer.JsonSerializer consumer: - group-id: devnogi-community-group + group-id: ${KAFKA_CONSUMER_GROUP_ID:devnogi-community-group} auto-offset-reset: latest key-deserializer: org.apache.kafka.common.serialization.StringDeserializer value-deserializer: org.springframework.kafka.support.serializer.JsonDeserializer