Skip to content

Commit 0103859

Browse files
committed
refactor: docker-compose를 수정하는게 아닌 cd.yml의 경로를 수정하여 해결
1 parent 5860ba4 commit 0103859

File tree

4 files changed

+24
-4
lines changed

4 files changed

+24
-4
lines changed

.github/workflows/dev-cd.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,18 @@ jobs:
135135
echo "Pulling new image: $FULL_IMAGE_NAME"
136136
docker pull $FULL_IMAGE_NAME
137137
138-
# 4. 작업 및 Nginx 설정 적용
138+
# 4. alloy 설정 및 Nginx 설정 적용
139139
cd /home/${{ secrets.DEV_USERNAME }}/solid-connection-dev
140+
141+
mkdir -p ./docs/infra-config
142+
143+
if [ -d "./docs/infra-config/config.alloy" ]; then
144+
echo "Removing directory created by Docker..."
145+
rm -rf ./docs/infra-config/config.alloy
146+
fi
147+
148+
mv -f ./config.alloy ./docs/infra-config/config.alloy
149+
140150
mkdir -p ./nginx
141151
mv ./nginx.dev.conf ./nginx/default.conf
142152
sudo cp ./nginx/default.conf /etc/nginx/conf.d/default.conf

.github/workflows/prod-cd.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,18 @@ jobs:
150150
echo "Pulling new image: $FULL_IMAGE_NAME"
151151
docker pull $FULL_IMAGE_NAME
152152
153-
# 4. Nginx 설정 적용
153+
# 4. alloy 설정 및 Nginx 설정 적용
154154
cd /home/${{ secrets.USERNAME }}/solid-connection-prod
155+
156+
mkdir -p ./docs/infra-config
157+
158+
if [ -d "./docs/infra-config/config.alloy" ]; then
159+
echo "Removing directory created by Docker..."
160+
rm -rf ./docs/infra-config/config.alloy
161+
fi
162+
163+
mv -f ./config.alloy ./docs/infra-config/config.alloy
164+
155165
mkdir -p ./nginx
156166
mv ./nginx.prod.conf ./nginx/default.conf
157167
sudo cp ./nginx/default.conf /etc/nginx/conf.d/default.conf

docker-compose.dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ services:
3939
- "12345:12345"
4040
volumes:
4141
- ./logs:/var/log/spring
42-
- ./config.alloy:/etc/alloy/config.alloy:ro
42+
- ./docs/infra-config/config.alloy:/etc/alloy/config.alloy:ro
4343
environment:
4444
- ALLOY_ENV=dev

docker-compose.prod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ services:
3939
- "12345:12345"
4040
volumes:
4141
- ./logs:/var/log/spring
42-
- ./config.alloy:/etc/alloy/config.alloy:ro
42+
- ./docs/infra-config/config.alloy:/etc/alloy/config.alloy:ro
4343
environment:
4444
- ALLOY_ENV=production

0 commit comments

Comments
 (0)