From 75afc450253317c4b8ee7fcd4a80d8891cf2d184 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 2 Oct 2025 08:16:50 -0400 Subject: [PATCH] .... --- .../workflows/pr-cloudflare-docker-deploy.yml | 30 +++++++++---------- docker-compose.yml | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index 9a347d56..7edcc9fd 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -180,18 +180,13 @@ jobs: username: ${{ secrets.BOT_GITEA_USER }} password: ${{ secrets.BOT_GITEA_PASSWORD }} - # - name: Install Vault (only if not cached) - # uses: cpanato/vault-installer@main + # - name: Generate .env file from Hashicorp Vault + # uses: Simporter/get-env-file-from-vault@v1.0.3 # with: - # version: ${{ env.HC_VAULT_VERSION }} - - - name: Generate .env file from Hashicorp Vault - uses: Simporter/get-env-file-from-vault@v1.0.3 - with: - VAULT_ADDR: ${{ secrets.TREZ_VAULT_ADDR }} - VAULT_USERNAME: ${{ secrets.VAULT_GITEA_USER }} - VAULT_PASSWORD: "${{ secrets.VAULT_GITEA_PASSWORD }}" - VAULT_SECRETS_PATH: rinoa-docker/env + # VAULT_ADDR: ${{ secrets.TREZ_VAULT_ADDR }} + # VAULT_USERNAME: ${{ secrets.VAULT_GITEA_USER }} + # VAULT_PASSWORD: "${{ secrets.VAULT_GITEA_PASSWORD }}" + # VAULT_SECRETS_PATH: rinoa-docker/env - name: Gotify Notification uses: eikendev/gotify-action@master @@ -201,10 +196,15 @@ jobs: notification_title: "GITEA: Docker Compose Dry Run @ Rinoa" notification_message: "Starting Docker Compose dry run..." - # - name: Generate .env file for Docker Compose - # run: | - # vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env - # echo ${DOCKER_SVC_LIST} + - name: Install Vault (only if not cached) + uses: cpanato/vault-installer@main + with: + version: ${{ env.HC_VAULT_VERSION }} + + - name: Generate .env file for Docker Compose + run: | + vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env + echo ${DOCKER_SVC_LIST} - name: Pre-pull/build service images in parallel uses: ./.gitea/actions/docker-img-pre-pull diff --git a/docker-compose.yml b/docker-compose.yml index 93bfeff1..6d928ba5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4954,7 +4954,7 @@ services: homepage.name: PlantUML homepage.href: https://plantuml.${MY_TLD} homepage.icon: plantuml.svg - homepage.description: Textual diagram generator for UML & other visualizations + homepage.description: Textual diagram generator for UML & other visualizations. swag: enable swag_port: 8080 swag_url: plantuml.${MY_TLD}