From 2c2d5d9b4927d50492f1a8a64e0170c3f155f3b6 Mon Sep 17 00:00:00 2001 From: Sanjay Soundarajan Date: Wed, 15 Jan 2025 13:18:47 -0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=B7=F0=9F=8F=BD=20ci:=20update=20deplo?= =?UTF-8?q?yment=20target=20(#127)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: slugb0t --- .github/workflows/deploy-main.yml | 3 +++ .github/workflows/deploy-staging.yml | 3 +++ bot/.kamal/secrets | 1 + bot/config/deploy.yml | 6 ++++-- ui/.kamal/secrets | 1 + ui/config/deploy.yml | 6 ++++-- validator/.kamal/secrets | 1 + validator/config/deploy.yml | 6 ++++-- 8 files changed, 21 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy-main.yml b/.github/workflows/deploy-main.yml index 6e2b190..d8d4e94 100644 --- a/.github/workflows/deploy-main.yml +++ b/.github/workflows/deploy-main.yml @@ -25,6 +25,7 @@ jobs: KAMAL_REGISTRY_PASSWORD: ${{ secrets.KAMAL_REGISTRY_PASSWORD }} KAMAL_SERVER_IP: ${{ secrets.KAMAL_SERVER_IP }} KAMAL_BOT_DOMAIN: ${{ secrets.KAMAL_BOT_DOMAIN }} + KAMAL_APP_NAME_BOT: ${{ secrets.KAMAL_APP_NAME_BOT }} DATABASE_URL: ${{ secrets.DATABASE_URL }} BOT_LOGWATCH_URL: ${{ secrets.BOT_LOGWATCH_URL }} APP_ID: ${{ secrets.APP_ID }} @@ -95,6 +96,7 @@ jobs: KAMAL_REGISTRY_PASSWORD: ${{ secrets.KAMAL_REGISTRY_PASSWORD }} KAMAL_SERVER_IP: ${{ secrets.KAMAL_SERVER_IP }} KAMAL_APP_DOMAIN: ${{ secrets.KAMAL_APP_DOMAIN }} + KAMAL_APP_NAME_UI: ${{ secrets.KAMAL_APP_NAME_UI }} DATABASE_URL: ${{ secrets.DATABASE_URL }} GH_APP_ID: ${{ secrets.GH_APP_ID }} GH_APP_PRIVATE_KEY: ${{ secrets.GH_APP_PRIVATE_KEY }} @@ -164,6 +166,7 @@ jobs: KAMAL_REGISTRY_PASSWORD: ${{ secrets.KAMAL_REGISTRY_PASSWORD }} KAMAL_SERVER_IP: ${{ secrets.KAMAL_SERVER_IP }} KAMAL_VALIDATOR_DOMAIN: ${{ secrets.KAMAL_VALIDATOR_DOMAIN }} + KAMAL_APP_NAME_VALIDATOR: ${{ secrets.KAMAL_APP_NAME_VALIDATOR }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml index 511958d..e5db704 100644 --- a/.github/workflows/deploy-staging.yml +++ b/.github/workflows/deploy-staging.yml @@ -25,6 +25,7 @@ jobs: KAMAL_REGISTRY_PASSWORD: ${{ secrets.KAMAL_REGISTRY_PASSWORD }} KAMAL_SERVER_IP: ${{ secrets.KAMAL_SERVER_IP }} KAMAL_BOT_DOMAIN: ${{ secrets.KAMAL_BOT_DOMAIN }} + KAMAL_APP_NAME_BOT: ${{ secrets.KAMAL_APP_NAME_BOT }} DATABASE_URL: ${{ secrets.DATABASE_URL }} BOT_LOGWATCH_URL: ${{ secrets.BOT_LOGWATCH_URL }} APP_ID: ${{ secrets.APP_ID }} @@ -95,6 +96,7 @@ jobs: KAMAL_REGISTRY_PASSWORD: ${{ secrets.KAMAL_REGISTRY_PASSWORD }} KAMAL_SERVER_IP: ${{ secrets.KAMAL_SERVER_IP }} KAMAL_APP_DOMAIN: ${{ secrets.KAMAL_APP_DOMAIN }} + KAMAL_APP_NAME_UI: ${{ secrets.KAMAL_APP_NAME_UI }} DATABASE_URL: ${{ secrets.DATABASE_URL }} GH_APP_ID: ${{ secrets.GH_APP_ID }} GH_APP_PRIVATE_KEY: ${{ secrets.GH_APP_PRIVATE_KEY }} @@ -164,6 +166,7 @@ jobs: KAMAL_REGISTRY_PASSWORD: ${{ secrets.KAMAL_REGISTRY_PASSWORD }} KAMAL_SERVER_IP: ${{ secrets.KAMAL_SERVER_IP }} KAMAL_VALIDATOR_DOMAIN: ${{ secrets.KAMAL_VALIDATOR_DOMAIN }} + KAMAL_APP_NAME_VALIDATOR: ${{ secrets.KAMAL_APP_NAME_VALIDATOR }} steps: - uses: actions/checkout@v4 diff --git a/bot/.kamal/secrets b/bot/.kamal/secrets index f1daf50..2692b41 100644 --- a/bot/.kamal/secrets +++ b/bot/.kamal/secrets @@ -9,6 +9,7 @@ KAMAL_REGISTRY_USERNAME=$KAMAL_REGISTRY_USERNAME KAMAL_REGISTRY_LOGIN_SERVER=$KAMAL_REGISTRY_LOGIN_SERVER # Kamal config +KAMAL_APP_NAME_BOT=$KAMAL_APP_NAME_BOT KAMAL_BOT_DOMAIN=$KAMAL_BOT_DOMAIN KAMAL_SERVER_IP=$KAMAL_SERVER_IP diff --git a/bot/config/deploy.yml b/bot/config/deploy.yml index b4cd87e..b9d3cd7 100644 --- a/bot/config/deploy.yml +++ b/bot/config/deploy.yml @@ -1,8 +1,10 @@ # Name of your application. Used to uniquely configure containers. -service: codefair-bot +# service: codefair-bot +service: <%= ENV["KAMAL_APP_NAME_BOT"] %> # Name of the container image. -image: codefair-bot +# image: codefair-bot +image: <%= ENV["KAMAL_APP_NAME_BOT"] %> # Deploy to these servers. servers: diff --git a/ui/.kamal/secrets b/ui/.kamal/secrets index 873ffc3..130bc91 100644 --- a/ui/.kamal/secrets +++ b/ui/.kamal/secrets @@ -8,6 +8,7 @@ KAMAL_REGISTRY_USERNAME=$KAMAL_REGISTRY_USERNAME KAMAL_REGISTRY_LOGIN_SERVER=$KAMAL_REGISTRY_LOGIN_SERVER # Kamal config +KAMAL_APP_NAME_UI=$KAMAL_APP_NAME_UI KAMAL_APP_DOMAIN=$KAMAL_APP_DOMAIN KAMAL_SERVER_IP=$KAMAL_SERVER_IP diff --git a/ui/config/deploy.yml b/ui/config/deploy.yml index 8453816..e439db6 100644 --- a/ui/config/deploy.yml +++ b/ui/config/deploy.yml @@ -1,8 +1,10 @@ # Name of your application. Used to uniquely configure containers. -service: codefair-ui +# service: codefair-ui +service: <%= ENV["KAMAL_APP_NAME_UI"] %> # Name of the container image. -image: codefair-ui +# image: codefair-ui +image: <%= ENV["KAMAL_APP_NAME_UI"] %> # Deploy to these servers. servers: diff --git a/validator/.kamal/secrets b/validator/.kamal/secrets index 6a64f4b..3053fc1 100644 --- a/validator/.kamal/secrets +++ b/validator/.kamal/secrets @@ -8,6 +8,7 @@ KAMAL_REGISTRY_USERNAME=$KAMAL_REGISTRY_USERNAME KAMAL_REGISTRY_LOGIN_SERVER=$KAMAL_REGISTRY_LOGIN_SERVER # Kamal config +KAMAL_APP_NAME_VALIDATOR=$KAMAL_APP_NAME_VALIDATOR KAMAL_VALIDATOR_DOMAIN=$KAMAL_VALIDATOR_DOMAIN KAMAL_SERVER_IP=$KAMAL_SERVER_IP diff --git a/validator/config/deploy.yml b/validator/config/deploy.yml index f98d813..191bf79 100644 --- a/validator/config/deploy.yml +++ b/validator/config/deploy.yml @@ -1,8 +1,10 @@ # Name of your application. Used to uniquely configure containers. -service: codefair-validator +# service: codefair-validator +service: <%= ENV["KAMAL_APP_NAME_VALIDATOR"] %> # Name of the container image. -image: codefair-validator +# image: codefair-validator +image: <%= ENV["KAMAL_APP_NAME_VALIDATOR"] %> # Deploy to these servers. servers: