Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deployment 2 #68

Merged
merged 2 commits into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config-service/src/main/resources/bootstrap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
3 changes: 1 addition & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -76,7 +76,6 @@ services:
container_name: zookeeper
ports:
- "2181:2181"
-
kafka:
image: wurstmeister/kafka:latest
container_name: kafka
Expand Down
2 changes: 1 addition & 1 deletion script/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions script/docker_init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading