Skip to content

Commit 2ec3edf

Browse files
authored
chore: dev->local, stage->dev 환경명 변경, 배포 방식 변경 (#288)
* rename: 도커 파일명 변경 * rename: stage -> dev 환경명 변경 * chore: dev환경이 develop 브랜치를 추적하게 변경
1 parent daea588 commit 2ec3edf

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
name: "[STAGE] Build Gradle and Deploy"
1+
name: "[DEV] Build Gradle and Deploy"
22

33
on:
44
push:
5-
branches: [ "release" ]
5+
branches: [ "develop" ]
66
workflow_dispatch:
77

88
jobs:
@@ -59,7 +59,7 @@ jobs:
5959
host: ${{ secrets.STAGE_HOST }}
6060
username: ${{ secrets.STAGE_USERNAME }}
6161
key: ${{ secrets.STAGE_PRIVATE_KEY }}
62-
source: "./docker-compose.stage.yml"
62+
source: "./docker-compose.dev.yml"
6363
target: "/home/${{ secrets.STAGE_USERNAME }}/solid-connect-stage/"
6464

6565
- name: Run docker compose
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ services:
1919
- redis
2020
network_mode: host
2121

22-
solid-connection-stage:
22+
solid-connection-dev:
2323
build:
2424
context: .
2525
dockerfile: Dockerfile
26-
container_name: solid-connection-stage
26+
container_name: solid-connection-dev
2727
ports:
2828
- "8080:8080"
2929
environment:
30-
- SPRING_PROFILES_ACTIVE=stage
30+
- SPRING_PROFILES_ACTIVE=dev
3131
volumes:
3232
- ./logs:/var/log/spring
3333
depends_on:
@@ -43,4 +43,4 @@ services:
4343
- ./logs:/var/log/spring
4444
- ./docs/config.alloy:/etc/alloy/config.alloy:ro
4545
environment:
46-
- ALLOY_ENV=stage
46+
- ALLOY_ENV=dev

src/main/resources/logback-spring.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<appender-ref ref="CONSOLE"/>
2828
</root>
2929

30-
<springProfile name="prod,stage">
30+
<springProfile name="prod,dev">
3131
<root level="INFO">
3232
<appender-ref ref="FILE"/>
3333
</root>

0 commit comments

Comments
 (0)