Skip to content

chore: dev->local, stage->dev 환경명 변경, 배포 방식 변경 #288

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.

Sign up for GitHub

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

Merged
wibaek merged 3 commits into from
Apr 30, 2025
Merged

chore: dev->local, stage->dev 환경명 변경, 배포 방식 변경 #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
adfa6f7
rename: 도커 파일명 변경
wibaek Apr 28, 2025
3172d91
rename: stage -> dev 환경명 변경
wibaek Apr 28, 2025
e650833
chore: dev환경이 develop 브랜치를 추적하게 변경
wibaek Apr 28, 2025
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
6 changes: 3 additions & 3 deletions .github/workflows/stage-cd.yml → .github/workflows/dev-cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: "[STAGE] Build Gradle and Deploy"
name: "[DEV] Build Gradle and Deploy"

on:
push:
branches: [ "release" ]
branches: [ "develop" ]
Copy link
Collaborator

@nayonsoso nayonsoso Apr 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이제 develop에 머지되면 CD가 돌아가겠네요 🥳

workflow_dispatch:

jobs:
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
host: ${{ secrets.STAGE_HOST }}
username: ${{ secrets.STAGE_USERNAME }}
key: ${{ secrets.STAGE_PRIVATE_KEY }}
source: "./docker-compose.stage.yml"
source: "./docker-compose.dev.yml"
Copy link
Collaborator

@nayonsoso nayonsoso Apr 28, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이 PR머지되기 전에 docker-compose 파일 이름이 바뀌어야 될 듯 합니다🧐

Copy link
Member Author

@wibaek wibaek Apr 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

파일명도 변경을 해두긴 했는데, 머지와 동시에 바꿔지면 문제가 있나요?

Copy link
Member Author

@wibaek wibaek Apr 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

아 workflow 파일에 도커파일 명시된것들이 다 바뀌지 않았었네요. 감사합니다

target: "/home/${{ secrets.STAGE_USERNAME }}/solid-connect-stage/"

- name: Run docker compose
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.stage.yml → docker-compose.dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ services:
- redis
network_mode: host

solid-connection-stage:
solid-connection-dev:
build:
context: .
dockerfile: Dockerfile
container_name: solid-connection-stage
container_name: solid-connection-dev
ports:
- "8080:8080"
environment:
- SPRING_PROFILES_ACTIVE=stage
- SPRING_PROFILES_ACTIVE=dev
volumes:
- ./logs:/var/log/spring
depends_on:
Expand All @@ -43,4 +43,4 @@ services:
- ./logs:/var/log/spring
- ./docs/config.alloy:/etc/alloy/config.alloy:ro
environment:
- ALLOY_ENV=stage
- ALLOY_ENV=dev
2 changes: 1 addition & 1 deletion src/main/resources/logback-spring.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<appender-ref ref="CONSOLE"/>
</root>

<springProfile name="prod,stage">
<springProfile name="prod,dev">
<root level="INFO">
<appender-ref ref="FILE"/>
</root>
Expand Down
Loading