👷 ci: test build

fairdataihub · Nov 14, 2024 · 7530096 · 7530096
1 parent 10b144d
commit 7530096
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml
@@ -20,7 +20,9 @@ jobs:
 
     env:
       DOCKER_BUILDKIT: 1
+      KAMAL_REGISTRY_USERNAME: ${{ secrets.KAMAL_REGISTRY_USERNAME }}
       KAMAL_REGISTRY_PASSWORD: ${{ secrets.KAMAL_REGISTRY_PASSWORD }}
+      KAMAL_REGISTRY_LOGIN_SERVER: ${{ secrets.KAMAL_REGISTRY_LOGIN_SERVER }}
       KAMAL_SERVER_IP: ${{ secrets.KAMAL_SERVER_IP }}
       APP_ID: ${{ secrets.APP_ID }}
       DATABASE_URL: ${{ secrets.DATABASE_URL }}
@@ -54,11 +56,11 @@ jobs:
           mv Dockerfile.staging Dockerfile
           mv config/deploy-staging.yml config/deploy.yml
 
-      - name: Login to Github Container Registry
-        uses: docker/login-action@v3
+      - name: Login to Azure Container Registry
+        uses: azure/docker-login@v1
         with:
-          registry: ghcr.io
-          username: megasanjay
+          login-server: ${{ secrets.KAMAL_REGISTRY_LOGIN_SERVER }}
+          username: ${{ secrets.KAMAL_REGISTRY_USERNAME }}
           password: ${{ secrets.KAMAL_REGISTRY_PASSWORD }}
 
       - name: Set up Docker Buildx for cache

diff --git a/bot/.kamal/secrets b/bot/.kamal/secrets
@@ -4,6 +4,8 @@
 
 # Option 1: Read secrets from the environment
 KAMAL_REGISTRY_PASSWORD=$KAMAL_REGISTRY_PASSWORD
+KAMAL_REGISTRY_USERNAME=$KAMAL_REGISTRY_USERNAME
+KAMAL_REGISTRY_LOGIN_SERVER=$KAMAL_REGISTRY_LOGIN_SERVER
 
 APP_ID=$APP_ID
 DATABASE_URL=$DATABASE_URL

diff --git a/bot/config/deploy-staging.yml b/bot/config/deploy-staging.yml
@@ -2,7 +2,7 @@
 service: codefair-bot
 
 # Name of the container image.
-image: megasanjay/codefair-bot
+image: <%= ENV["KAMAL_REGISTRY_LOGIN_SERVER"] %>/codefair-bot
 
 # Deploy to these servers.
 servers:
@@ -28,8 +28,8 @@ proxy:
 registry:
   # Specify the registry server, if you're not using Docker Hub
   # server: registry.digitalocean.com / ghcr.io / ...
-  server: https://ghcr.io
-  username: megasanjay
+  server: <%= ENV["KAMAL_REGISTRY_LOGIN_SERVER"] %>
+  username: <%= ENV["KAMAL_REGISTRY_USERNAME"] %>
 
   # Always use an access token rather than real password (pulled from .kamal/secrets).
   password: