From be9f303b37e55ee5425bc13abf6b8d2da8259560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joe=20K=C3=BCng?= Date: Sat, 14 Mar 2026 18:42:53 +0100 Subject: [PATCH] fix(deploy): common..env --- .gitea/workflows/deploy.yaml | 6 ++++-- README.md | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 8b31d34..2323d76 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -191,7 +191,7 @@ jobs: fi DEPLOY_OWNER=$(echo '${{ gitea.repository_owner }}' | tr '[:upper:]' '[:lower:]') - cat "deploy/envs/common.env" > /tmp/common_env.env + : > /tmp/common_env.env cat "deploy/envs/${{ env.ENV }}.env" > /tmp/full_env.env if [[ "${{ env.ENV }}" == "prod" ]]; then @@ -218,7 +218,9 @@ jobs: ADMIN_TTL="${ADMIN_TTL:-480}" printf 'ADMIN_PASSWORD="%s"\nADMIN_SESSION_SECRET="%s"\nADMIN_SESSION_TTL_MINUTES="%s"\n' \ "${{ secrets.ADMIN_PASSWORD }}" "${{ secrets.ADMIN_SESSION_SECRET }}" "$ADMIN_TTL" >> /tmp/full_env.env - printf 'OPENAI_API_KEY="%s"\n' "${{ secrets.OPENAI_API_KEY }}" >> /tmp/common_env.env + if [[ -n "${{ secrets.OPENAI_API_KEY }}" ]]; then + printf 'OPENAI_API_KEY="%s"\n' "${{ secrets.OPENAI_API_KEY }}" >> /tmp/common_env.env + fi echo "Preparing to send common env file with variables:" grep -Ev "PASSWORD|SECRET|KEY|TOKEN" /tmp/common_env.env || true diff --git a/README.md b/README.md index 7e13103..f3bc18a 100644 --- a/README.md +++ b/README.md @@ -113,4 +113,4 @@ Verifica che `MEDIA_FFMPEG_PATH` punti a un `ffmpeg` con supporto JPEG, WebP e A Verifica le credenziali in `application.properties`. Se usi Docker, puoi passare `DB_URL`, `DB_USERNAME` e `DB_PASSWORD` come variabili d'ambiente. ### Deploy e traduzioni OpenAI -Nel deploy Gitea la chiave OpenAI deve stare nel secret `OPENAI_API_KEY`. La pipeline la scrive nel file `common.env` remoto e il container backend la riceve come variabile runtime. Le opzioni non sensibili condivise fra ambienti stanno in [deploy/envs/common.env](/Users/joe/IdeaProjects/print-calculator/deploy/envs/common.env), mentre i file `deploy/envs/*.env` restano per i valori specifici di `dev/int/prod`. +Nel deploy Gitea la chiave OpenAI deve stare nel secret `OPENAI_API_KEY`. La pipeline genera il blocco `common.env` remoto durante il deploy e il container backend la riceve come variabile runtime. I file `deploy/envs/*.env` restano per i valori specifici di `dev/int/prod`.