diff --git a/config-service/src/main/resources/bootstrap.yml b/config-service/src/main/resources/bootstrap.yml index f312c907..1963e0d2 100644 --- a/config-service/src/main/resources/bootstrap.yml +++ b/config-service/src/main/resources/bootstrap.yml @@ -13,4 +13,4 @@ spring: uri: ${CONFIG_GIT_URI} ignore-local-ssh-settings: true passphrase: ${CONFIG_PASSPHRASE} - private-key: ${CONFIG_PRIVATE_KEY} + private-key: ${CONFIG_PRIVATE_KEY_DIR} diff --git a/docker-compose.yml b/docker-compose.yml index 55c98432..3a6e6fa9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,7 +30,7 @@ services: environment: CONFIG_GIT_URI : ${CONFIG_GIT_URI} CONFIG_PASSPHRASE : ${CONFIG_PASSPHRASE} - CONFIG_PRIVATE_KEY : ${CONFIG_PRIVATE_KEY} + CONFIG_PRIVATE_KEY_DIR : ${CONFIG_PRIVATE_KEY_DIR} restart: always volumes: - /home/ec2-user/logs/config:/logs @@ -76,7 +76,6 @@ services: container_name: zookeeper ports: - "2181:2181" - - kafka: image: wurstmeister/kafka:latest container_name: kafka diff --git a/script/common.sh b/script/common.sh index dded4d1f..25f2e6ac 100644 --- a/script/common.sh +++ b/script/common.sh @@ -7,7 +7,7 @@ RUNNING_KAFKA=$(docker ps | grep kafka) # Eureka 검색 if [ -z "$RUNNING_EUREKA" ]; then echo "Starting Eureka ..." - docker compose -f /home/docker-compose.yml up -d eureka + docker-compose -f /home/docker-compose.yml up -d eureka sleep 5 #Eureka 실행 5초 대기 else echo "Eureka is already running" diff --git a/script/docker_init.sh b/script/docker_init.sh index 63abc33e..48431a7c 100644 --- a/script/docker_init.sh +++ b/script/docker_init.sh @@ -34,9 +34,10 @@ if ! command -v docker-compose &> /dev/null; then echo "Docker-compose install start..." #Docker compose plugin 설치 - Amazon Linux 2023 - sudo curl -L "https://github.com/docker/compose/releases/download/1.28.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose + sudo curl -L https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose sudo chmod +x /usr/local/bin/docker-compose - sudo ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose + + docker-compose version echo "Docker-compose install complete!" else