diff --git a/.github/workflows/stage-cd.yml b/.github/workflows/dev-cd.yml
similarity index 95%
rename from .github/workflows/stage-cd.yml
rename to .github/workflows/dev-cd.yml
index 41ff68b37..793f3dea3 100644
--- a/.github/workflows/stage-cd.yml
+++ b/.github/workflows/dev-cd.yml
@@ -1,8 +1,8 @@
-name: "[STAGE] Build Gradle and Deploy"
+name: "[DEV] Build Gradle and Deploy"
on:
push:
- branches: [ "release" ]
+ branches: [ "develop" ]
workflow_dispatch:
jobs:
@@ -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"
target: "/home/${{ secrets.STAGE_USERNAME }}/solid-connect-stage/"
- name: Run docker compose
diff --git a/docker-compose.stage.yml b/docker-compose.dev.yml
similarity index 85%
rename from docker-compose.stage.yml
rename to docker-compose.dev.yml
index c4ccd687f..a37ef4c55 100644
--- a/docker-compose.stage.yml
+++ b/docker-compose.dev.yml
@@ -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:
@@ -43,4 +43,4 @@ services:
- ./logs:/var/log/spring
- ./docs/config.alloy:/etc/alloy/config.alloy:ro
environment:
- - ALLOY_ENV=stage
+ - ALLOY_ENV=dev
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 390c7c606..e179be0fb 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -27,7 +27,7 @@
-
+