Changing workflow secrets.
Renovate / renovate (push) Successful in 1m7s

This commit is contained in:
2025-09-23 20:19:43 -04:00
parent b4dcefdf25
commit 81e97ed825
2 changed files with 58 additions and 59 deletions
+54 -55
View File
@@ -4,15 +4,15 @@ on:
workflow_dispatch: workflow_dispatch:
push: push:
branches-ignore: branches-ignore:
- 'main' - "main"
paths: paths:
- 'docker-compose.misc.yml' - "docker-compose.misc.yml"
- 'compose/docker-compose*.yml' - "compose/docker-compose*.yml"
- '**/pr-docker-deploy.yml' - "**/pr-docker-deploy.yml"
env: env:
HC_VAULT_VERSION: '1.20.0' HC_VAULT_VERSION: "1.20.0"
TEA_VERSION: '0.10.1' TEA_VERSION: "0.10.1"
jobs: jobs:
check-and-create-pr: check-and-create-pr:
@@ -42,16 +42,16 @@ jobs:
- name: Gotify Notification - name: Gotify Notification
uses: eikendev/gotify-action@master uses: eikendev/gotify-action@master
with: with:
gotify_api_base: '${{ secrets.GOTIFY_URL }}' gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}"
gotify_app_token: '${{ secrets.RUNNER_GOTIFY_TOKEN }}' gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}"
notification_title: 'GITEA: PR Check' notification_title: "GITEA: PR Check"
notification_message: 'Checking for existing PR... 🔍' notification_message: "Checking for existing PR... 🔍"
- name: Check if open PR exists - name: Check if open PR exists
id: check-opened-pr-step id: check-opened-pr-step
continue-on-error: true continue-on-error: true
run: | run: |
tea login add --name gitea-rinoa --url "${{ secrets.BDIKTA_GITEA_URL }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} tea login add --name gitea-rinoa --url "${{ secrets.TREZ_GITEA_URL }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
pr_exists=$(tea pr list --repo ${{ github.repository }} --state open --fields index,title,head | egrep '\[DOCKER\].*${{ github.ref_name }}' | tail -1 | wc -l) pr_exists=$(tea pr list --repo ${{ github.repository }} --state open --fields index,title,head | egrep '\[DOCKER\].*${{ github.ref_name }}' | tail -1 | wc -l)
echo "exists=$pr_exists" >> $GITHUB_OUTPUT echo "exists=$pr_exists" >> $GITHUB_OUTPUT
@@ -66,10 +66,10 @@ jobs:
- name: Gotify Notification - name: Gotify Notification
uses: eikendev/gotify-action@master uses: eikendev/gotify-action@master
with: with:
gotify_api_base: '${{ secrets.GOTIFY_URL }}' gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}"
gotify_app_token: '${{ secrets.RUNNER_GOTIFY_TOKEN }}' gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}"
notification_title: 'GITEA: PR Check' notification_title: "GITEA: PR Check"
notification_message: 'PR Created 🎟️' notification_message: "PR Created 🎟️"
generate-service-list: generate-service-list:
name: Generate list of added/modified/deleted services name: Generate list of added/modified/deleted services
@@ -78,7 +78,6 @@ jobs:
outputs: outputs:
svc_deploy_list: ${{ steps.detect_services.outputs.docker_svc_list }} svc_deploy_list: ${{ steps.detect_services.outputs.docker_svc_list }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
@@ -89,10 +88,10 @@ jobs:
- name: Gotify Notification - name: Gotify Notification
uses: eikendev/gotify-action@master uses: eikendev/gotify-action@master
with: with:
gotify_api_base: '${{ secrets.GOTIFY_URL }}' gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}"
gotify_app_token: '${{ secrets.RUNNER_GOTIFY_TOKEN }}' gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}"
notification_title: 'GITEA: Services TBD' notification_title: "GITEA: Services TBD"
notification_message: 'Generating list of services to deploy...' notification_message: "Generating list of services to deploy..."
- name: Detect added, deleted, and modified services - name: Detect added, deleted, and modified services
id: detect_services id: detect_services
@@ -178,7 +177,7 @@ jobs:
outputs: outputs:
compose_file_list: ${{ steps.compose_file_list.outputs.compose_list }} compose_file_list: ${{ steps.compose_file_list.outputs.compose_list }}
env: env:
VAULT_ADDR: ${{ secrets.VAULT_ADDR }} VAULT_ADDR: ${{ secrets.TREZ_VAULT_ADDR }}
VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }} VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }}
VAULT_NAMESPACE: "" VAULT_NAMESPACE: ""
REGISTRY_PASSWORD: ${{ secrets.BOT_GITEA_PASSWORD }} REGISTRY_PASSWORD: ${{ secrets.BOT_GITEA_PASSWORD }}
@@ -212,10 +211,10 @@ jobs:
- name: Gotify Notification - name: Gotify Notification
uses: eikendev/gotify-action@master uses: eikendev/gotify-action@master
with: with:
gotify_api_base: '${{ secrets.GOTIFY_URL }}' gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}"
gotify_app_token: '${{ secrets.RUNNER_GOTIFY_TOKEN }}' gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}"
notification_title: 'GITEA: Docker Compose Dry Run @ Benedikta' notification_title: "GITEA: Docker Compose Dry Run @ Benedikta"
notification_message: 'Starting Docker Compose dry run...' notification_message: "Starting Docker Compose dry run..."
- name: Generate .env file for Docker Compose - name: Generate .env file for Docker Compose
run: | run: |
@@ -240,24 +239,24 @@ jobs:
with: with:
mode: compose mode: compose
file: ${{ steps.compose_file_list.outputs.compose_list }} file: ${{ steps.compose_file_list.outputs.compose_list }}
name: 'ovosmisc' name: "ovosmisc"
host: 192.168.1.250 host: 192.168.1.250
user: ovos user: ovos
ssh_key: ${{ secrets.BDIKTA_GITEA_PRIVATE_SSH_KEY }} ssh_key: ${{ secrets.RUNNER_SSH_PRIVATE_KEY }}
args: --remove-orphans --dry-run ${{ needs.generate-service-list.outputs.svc_deploy_list }} args: --remove-orphans --dry-run ${{ needs.generate-service-list.outputs.svc_deploy_list }}
env_file: '.env' env_file: ".env"
registry_host: 'docker.io' registry_host: "docker.io"
registry_user: ${{ secrets.DOCKER_HUB_USER }} registry_user: ${{ secrets.DOCKERHUB_USER }}
registry_pass: ${{ secrets.DOCKER_HUB_PASSWORD }} registry_pass: ${{ secrets.DOCKERHUB_PASSWORD }}
summary: true summary: true
- name: Gotify Notification - name: Gotify Notification
uses: eikendev/gotify-action@master uses: eikendev/gotify-action@master
with: with:
gotify_api_base: '${{ secrets.GOTIFY_URL }}' gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}"
gotify_app_token: '${{ secrets.RUNNER_GOTIFY_TOKEN }}' gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}"
notification_title: 'GITEA: Docker Compose Dry Run @ Benedikta' notification_title: "GITEA: Docker Compose Dry Run @ Benedikta"
notification_message: 'Docker Compose dry run completed successfully.' notification_message: "Docker Compose dry run completed successfully."
pr-merge: pr-merge:
name: PR Merge name: PR Merge
@@ -284,7 +283,7 @@ jobs:
- name: PR Merge - name: PR Merge
id: pr_merge id: pr_merge
run: | run: |
tea login add --name gitea-rinoa --url ${{ secrets.BDIKTA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} tea login add --name gitea-rinoa --url ${{ secrets.TREZ_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
tea login default gitea-rinoa tea login default gitea-rinoa
echo "Merging PR..." echo "Merging PR..."
pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ github.ref_name }} | awk -F"," '{print $1}' | sed -e 's|"||g') pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ github.ref_name }} | awk -F"," '{print $1}' | sed -e 's|"||g')
@@ -294,17 +293,17 @@ jobs:
- name: Gotify Notification - name: Gotify Notification
uses: eikendev/gotify-action@master uses: eikendev/gotify-action@master
with: with:
gotify_api_base: '${{ secrets.GOTIFY_URL }}' gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}"
gotify_app_token: '${{ secrets.RUNNER_GOTIFY_TOKEN }}' gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}"
notification_title: 'GITEA: PR Merge Successful' notification_title: "GITEA: PR Merge Successful"
notification_message: 'PR #${{ steps.pr_merge.outputs.pr_index }} merged.' notification_message: "PR #${{ steps.pr_merge.outputs.pr_index }} merged."
docker-compose-deploy: docker-compose-deploy:
name: Docker Compose Deployment name: Docker Compose Deployment
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: [generate-service-list, docker-compose-dry-run, pr-merge] needs: [generate-service-list, docker-compose-dry-run, pr-merge]
env: env:
VAULT_ADDR: ${{ secrets.VAULT_ADDR }} VAULT_ADDR: ${{ secrets.TREZ_VAULT_ADDR }}
VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }} VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }}
REGISTRY_PASSWORD: ${{ secrets.BOT_GITEA_PASSWORD }} REGISTRY_PASSWORD: ${{ secrets.BOT_GITEA_PASSWORD }}
steps: steps:
@@ -333,28 +332,28 @@ jobs:
- name: Gotify Notification - name: Gotify Notification
uses: eikendev/gotify-action@master uses: eikendev/gotify-action@master
with: with:
gotify_api_base: '${{ secrets.GOTIFY_URL }}' gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}"
gotify_app_token: '${{ secrets.RUNNER_GOTIFY_TOKEN }}' gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}"
notification_title: 'GITEA: Docker Compose Deployment @ Benedikta' notification_title: "GITEA: Docker Compose Deployment @ Benedikta"
notification_message: 'Starting Docker Compose run...' notification_message: "Starting Docker Compose run..."
- name: Generate .env file for deployment - name: Generate .env file for deployment
run: | run: |
vault kv get -format=json benedikta-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env vault kv get -format=json benedikta-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env
echo ${DOCKER_SVC_LIST} echo ${DOCKER_SVC_LIST}
echo ${COMPOSE_FILE_LIST} echo ${COMPOSE_FILE_LIST}
- name: Docker Compose Deployment - name: Docker Compose Deployment
uses: cssnr/stack-deploy-action@d58b92bcd776afc57ef12f55bafff71200fd218e # v1.4.0 uses: cssnr/stack-deploy-action@d58b92bcd776afc57ef12f55bafff71200fd218e # v1.4.0
with: with:
mode: compose mode: compose
file: ${{ needs.docker-compose-dry-run.outputs.compose_file_list }} file: ${{ needs.docker-compose-dry-run.outputs.compose_file_list }}
name: 'ovosmisc' name: "ovosmisc"
host: 192.168.1.250 host: 192.168.1.250
user: ovos user: ovos
ssh_key: ${{ secrets.BDIKTA_GITEA_PRIVATE_SSH_KEY }} ssh_key: ${{ secrets.RUNNER_SSH_PRIVATE_KEY }}
args: --remove-orphans ${{ needs.generate-service-list.outputs.svc_deploy_list }} args: --remove-orphans ${{ needs.generate-service-list.outputs.svc_deploy_list }}
env_file: '.env' env_file: ".env"
# registry_host: 'ghcr.io' # registry_host: 'ghcr.io'
# registry_user: TrezOne # registry_user: TrezOne
# registry_pass: ${{ secrets.GHCR_LOGIN_TOKEN }} # registry_pass: ${{ secrets.GHCR_LOGIN_TOKEN }}
@@ -363,7 +362,7 @@ jobs:
- name: Gotify Notification - name: Gotify Notification
uses: eikendev/gotify-action@master uses: eikendev/gotify-action@master
with: with:
gotify_api_base: '${{ secrets.GOTIFY_URL }}' gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}"
gotify_app_token: '${{ secrets.RUNNER_GOTIFY_TOKEN }}' gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}"
notification_title: 'GITEA: Docker Compose Deployment @ Benedikta' notification_title: "GITEA: Docker Compose Deployment @ Benedikta"
notification_message: 'Deployment completed successfully.' notification_message: "Deployment completed successfully."
+4 -4
View File
@@ -10,7 +10,7 @@ on:
- "./docker-compose.misc.yml" - "./docker-compose.misc.yml"
env: env:
VAULT_ADDR: ${{ secrets.VAULT_ADDR }} VAULT_ADDR: ${{ secrets.TREZ_VAULT_ADDR }}
VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }} VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }}
HC_VAULT_VERSION: "1.18.0" HC_VAULT_VERSION: "1.18.0"
@@ -146,7 +146,7 @@ jobs:
- name: Gotify Notification - name: Gotify Notification
uses: eikendev/gotify-action@master uses: eikendev/gotify-action@master
with: with:
gotify_api_base: "${{ secrets.GOTIFY_URL }}" gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}"
gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}" gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}"
notification_title: "GITEA: [RENOVATE] Docker Compose Deployment @ Rikku" notification_title: "GITEA: [RENOVATE] Docker Compose Deployment @ Rikku"
notification_message: "Starting Docker Compose run..." notification_message: "Starting Docker Compose run..."
@@ -159,7 +159,7 @@ jobs:
name: "ovosmisc" name: "ovosmisc"
host: 192.168.1.250 host: 192.168.1.250
user: ovos user: ovos
ssh_key: ${{ secrets.BDIKTA_GITEA_PRIVATE_SSH_KEY }} ssh_key: ${{ secrets.RUNNER_SSH_PRIVATE_KEY }}
args: --remove-orphans ${{ steps.services.outputs.docker_svc_list }} args: --remove-orphans ${{ steps.services.outputs.docker_svc_list }}
env_file: ".env" env_file: ".env"
# registry_host: 'ghcr.io' # registry_host: 'ghcr.io'
@@ -170,7 +170,7 @@ jobs:
- name: Gotify Notification - name: Gotify Notification
uses: eikendev/gotify-action@master uses: eikendev/gotify-action@master
with: with:
gotify_api_base: "${{ secrets.GOTIFY_URL }}" gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}"
gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}" gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}"
notification_title: "GITEA: [RENOVATE] Docker Compose Deployment @ Rikku" notification_title: "GITEA: [RENOVATE] Docker Compose Deployment @ Rikku"
notification_message: "Deployment completed successfully." notification_message: "Deployment completed successfully."