[Kamal 2] How to upgrade a conditional on .env.erb to the new .secret file?

[jmonteiro]

On Kamal v1, I had the following on .env.erb:

DATABASE_URL=<%= ENV.fetch("DATABASE_URL", false) || `op read --no-newline "op://Pet Project/Supabase/url"` %>

I have it setup as that so I can deploy from GitHub Actions (using the DATABASE_URL from the GitHub secrets storage), but also can deploy it locally using secrets stored on my personal 1Password account.

When upgrading to Kamal v2, I created the following new .kamal/secrets:

DATABASE_URL=$(op read --no-newline "op://Pet Project/Supabase/url")

However, I wasn't able to replicate the preference for an existing $DATABASE_URL for deploying from GitHub Actions. I tried this but it didn't work: DATABASE_URL=${DATABASE_URL:-$(op read --no-newline "op://Pet Project/Supabase/url")}

Any suggestions on how to migrate this feature from v1 to v2?

As a note, for now I simply have a .kamal/secrets-gha file with

DATABASE_URL=$DATABASE_URL

and before the kamal deploy instruction on the GitHub workflow I have a instruction to run cp .kamal/secrets-gha .kamal/secrets so it loads it from the correct place.