From 29fc34289e4f226a92d52840d27f43c3a498a777 Mon Sep 17 00:00:00 2001 From: Wibaek Park Date: Mon, 5 May 2025 09:22:11 +0900 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20alloy=20config=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=EC=9D=84=20=EB=B0=B0=ED=8F=AC=EC=8B=9C=EC=97=90=20?= =?UTF-8?q?=EC=A0=84=EC=86=A1=ED=95=98=EA=B2=8C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev-cd.yml | 9 +++++++++ .github/workflows/prod-cd.yml | 11 ++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dev-cd.yml b/.github/workflows/dev-cd.yml index 1efa6d266..b86b541e1 100644 --- a/.github/workflows/dev-cd.yml +++ b/.github/workflows/dev-cd.yml @@ -62,6 +62,15 @@ jobs: source: "./docker-compose.dev.yml" target: "/home/${{ secrets.DEV_USERNAME }}/solid-connection-dev/" + - name: Copy alloy config file to remote + uses: appleboy/scp-action@master + with: + host: ${{ secrets.DEV_HOST }} + username: ${{ secrets.DEV_USERNAME }} + key: ${{ secrets.DEV_PRIVATE_KEY }} + source: "./docs/config.alloy" + target: "/home/${{ secrets.DEV_USERNAME }}/solid-connection-dev/" + - name: Run docker compose uses: appleboy/ssh-action@master with: diff --git a/.github/workflows/prod-cd.yml b/.github/workflows/prod-cd.yml index 9030c80f5..354128b77 100644 --- a/.github/workflows/prod-cd.yml +++ b/.github/workflows/prod-cd.yml @@ -61,7 +61,16 @@ jobs: key: ${{ secrets.PRIVATE_KEY }} source: "./docker-compose.prod.yml" target: "/home/${{ secrets.USERNAME }}/solid-connect-server/" - + + - name: Copy alloy config file to remote + uses: appleboy/scp-action@master + with: + host: ${{ secrets.HOST }} + username: ${{ secrets.USERNAME }} + key: ${{ secrets.PRIVATE_KEY }} + source: "./docs/config.alloy" + target: "/home/${{ secrets.USERNAME }}/solid-connect-server/" + - name: Run docker compose uses: appleboy/ssh-action@master with: From 2999b277ad01c2b0a8e75be08ceff7d9136f953f Mon Sep 17 00:00:00 2001 From: Wibaek Park Date: Mon, 5 May 2025 09:23:11 +0900 Subject: [PATCH 2/2] =?UTF-8?q?chore:=20alloy=20container=20=EC=8B=A4?= =?UTF-8?q?=ED=96=89=EC=8B=9C=20config=20=ED=8C=8C=EC=9D=BC=20=EC=9C=84?= =?UTF-8?q?=EC=B9=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.dev.yml | 2 +- docker-compose.prod.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index a37ef4c55..e66e3a201 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -41,6 +41,6 @@ services: - "12345:12345" volumes: - ./logs:/var/log/spring - - ./docs/config.alloy:/etc/alloy/config.alloy:ro + - ./config.alloy:/etc/alloy/config.alloy:ro environment: - ALLOY_ENV=dev diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 30b0c9fc1..a6952f72c 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -40,6 +40,6 @@ services: - "12345:12345" volumes: - ./logs:/var/log/spring - - ./docs/config.alloy:/etc/alloy/config.alloy:ro + - ./config.alloy:/etc/alloy/config.alloy:ro environment: - ALLOY_ENV=production