wip

datocms · Dec 13, 2024 · af8b742 · af8b742
1 parent c9bc121
commit af8b742
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -46,8 +46,9 @@ jobs:
 
       - name: Deploy Application
         env:
-          GITHUB_CONTAINER_REGISTRY_API_TOKEN: ${{ secrets.GCR_API_TOKEN }}
+          CONTAINER_REGISTRY_API_TOKEN: ${{ secrets.GCR_API_TOKEN }}
           PRIVATE_KEY: ${{ secrets.KAVO_PRIVATE_KEY }}
         run: |
-          sed -i -E -e 's/\-\-break 0/--wrap=0/g' -e '/^SECRETS=/d' -e 's/^GITHUB_CONTAINER_REGISTRY_API_TOKEN=.*$/GITHUB_CONTAINER_REGISTRY_API_TOKEN=$GITHUB_CONTAINER_REGISTRY_API_TOKEN/' .kamal/secrets.$KAMAL_DESTINATION
+          sed -i -E -e 's/\-\-break 0/--wrap=0/g' -e '/^SECRETS=/d' -e 's/^CONTAINER_REGISTRY_API_TOKEN=.*$/CONTAINER_REGISTRY_API_TOKEN=$CONTAINER_REGISTRY_API_TOKEN/' .kamal/secrets.$KAMAL_DESTINATION
+          ruby -e 'require "dotenv"; puts ::Dotenv.parse(".kamal/secrets.staging").inspect'
           kamal deploy -d $KAMAL_DESTINATION
diff --git a/.kamal/secrets.production b/.kamal/secrets.production
@@ -11,5 +11,5 @@ ROLLBAR_TOKEN=$(echo $KAVO_SECRETS | base64 --decode | sed -n 's/^ROLLBAR_TOKEN=
 SECRET_API_TOKEN=$(echo $KAVO_SECRETS | base64 --decode | sed -n 's/^SECRET_API_TOKEN=//p')
 SLACK_TOKEN=$(echo $KAVO_SECRETS | base64 --decode | sed -n 's/^SLACK_TOKEN=//p')
 
-SECRETS=$(kamal secrets fetch --adapter bitwarden --account [email protected] GITHUB_CONTAINER_REGISTRY_API_TOKEN)
-GITHUB_CONTAINER_REGISTRY_API_TOKEN=$(kamal secrets extract GITHUB_CONTAINER_REGISTRY_API_TOKEN $SECRETS)
+SECRETS=$(kamal secrets fetch --adapter bitwarden --account [email protected] CONTAINER_REGISTRY_API_TOKEN)
+CONTAINER_REGISTRY_API_TOKEN=$(kamal secrets extract CONTAINER_REGISTRY_API_TOKEN $SECRETS)
diff --git a/.kamal/secrets.staging b/.kamal/secrets.staging
@@ -11,5 +11,7 @@ ROLLBAR_TOKEN=$(echo $KAVO_SECRETS | base64 --decode | sed -n 's/^ROLLBAR_TOKEN=
 SECRET_API_TOKEN=$(echo $KAVO_SECRETS | base64 --decode | sed -n 's/^SECRET_API_TOKEN=//p')
 SLACK_TOKEN=$(echo $KAVO_SECRETS | base64 --decode | sed -n 's/^SLACK_TOKEN=//p')
 
-SECRETS=$(kamal secrets fetch --adapter bitwarden --account [email protected] GITHUB_CONTAINER_REGISTRY_API_TOKEN)
-GITHUB_CONTAINER_REGISTRY_API_TOKEN=$(kamal secrets extract GITHUB_CONTAINER_REGISTRY_API_TOKEN $SECRETS)
+PPP=$PRIVATE_KEY
+
+SECRETS=$(kamal secrets fetch --adapter bitwarden --account [email protected] CONTAINER_REGISTRY_API_TOKEN)
+CONTAINER_REGISTRY_API_TOKEN=$(kamal secrets extract CONTAINER_REGISTRY_API_TOKEN $SECRETS)
diff --git a/config/deploy.yml b/config/deploy.yml
@@ -6,7 +6,7 @@ registry:
   server: ghcr.io
   username: datocms
   password:
-    - GITHUB_CONTAINER_REGISTRY_API_TOKEN
+    - CONTAINER_REGISTRY_API_TOKEN
 
 servers:
   web: