From 5243f317417ba172662d1a30274567f641f88225 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sat, 11 Jan 2025 20:12:20 -0500 Subject: [PATCH 01/34] Adjusting PR merge step. --- .gitea/workflows/deployment.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index ea77330b..430c6ee6 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -166,13 +166,21 @@ jobs: version: '0.9.2' - name: PR Merge + id: pr_merge run: | tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} - tea pr ls --repo ${{ github.repository }} --state all + tea login default gitea-rinoa pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ gitea.ref_name }} | awk -F, '{print $1}' | sed -e 's|"||g') tea pr m --repo ${{ github.repository }} --title "Auto Merge of PR #${pr_index} - ${{ gitea.ref_name }}" --message "Merged by ${{ gitea.actor }}" --output table ${pr_index} - echo "PR_INDEX=${pr_index}" >> $GITHUB_OUPUT - + echo "pr_index=${pr_index}" >> $GITHUB_OUTPUT + + - name: Wait for PR to be merged + run: | + while true; do + pr_state=$(tea pr ls --repo ${{ github.repository }} --state merged --fields index,title,head,state --output csv | egrep ${{ github.ref_name }} | awk -F, '{print $4}' | sed -e 's|"||g') + if [ "${pr_state}" == "merged" ]; then + break + - name: Gotify Notification uses: eikendev/gotify-action@master with: @@ -189,7 +197,7 @@ jobs: approvers: Trez.One minimum-approvals: 1 approval-wait: 600 - issue-title: 'Manual Approval for #${pr_index} - ${{ gitea.ref_name }}' + issue-title: 'Manual Approval for #${{ steps.pr_merge.outputs.pr_index }} - ${{ gitea.ref_name }}' issue-body: | "Autobots, roll out!" From 35491a1b838340984f825552de30e7dba13ea7e2 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sun, 12 Jan 2025 11:58:00 -0500 Subject: [PATCH 02/34] . --- .gitea/workflows/deployment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 430c6ee6..d3edf346 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -149,6 +149,7 @@ jobs: - name: Regenerate README uses: gnpaone/dynamic-update-readme@v1.0.2 with: + table: true marker_text: "SERVICES_LIST" markdown_text: | ${{ steps.service-table.outputs.table }} From d53db6f67d578fcda01c884694a539ccce6f5790 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sun, 12 Jan 2025 13:13:46 -0500 Subject: [PATCH 03/34] Changing order of steps in trigger job. --- .gitea/workflows/deployment.yml | 40 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index d3edf346..8a2835e8 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -159,6 +159,26 @@ jobs: needs: [generate-readme, docker-compose-test, regenerate-readme] runs-on: ubuntu-latest steps: + - name: Gotify Notification + uses: eikendev/gotify-action@master + with: + gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}' + gotify_app_token: '${{ secrets.RINOA_GOTIFY_TOKEN }}' + notification_title: 'Ready to Deploy' + notification_message: 'Ready to deploy: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/jobs/${{ github.job }}' + + - name: Trigger Deployment + id: deploy-trigger + uses: macnev2013/manual-approval@v1.0.18 + with: + secret: ${{ github.TOKEN }} + approvers: Trez.One + minimum-approvals: 1 + approval-wait: 600 + issue-title: 'Manual Approval for #${{ steps.pr_merge.outputs.pr_index }} - ${{ gitea.ref_name }}' + issue-body: | + "Autobots, roll out!" + - name: Install tea uses: supplypike/setup-bin@v4 with: @@ -182,26 +202,6 @@ jobs: if [ "${pr_state}" == "merged" ]; then break - - name: Gotify Notification - uses: eikendev/gotify-action@master - with: - gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}' - gotify_app_token: '${{ secrets.RINOA_GOTIFY_TOKEN }}' - notification_title: 'Ready to Deploy' - notification_message: 'Ready to deploy: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/jobs/${{ github.job }}' - - - name: Trigger Deployment - id: deploy-trigger - uses: macnev2013/manual-approval@v1.0.18 - with: - secret: ${{ github.TOKEN }} - approvers: Trez.One - minimum-approvals: 1 - approval-wait: 600 - issue-title: 'Manual Approval for #${{ steps.pr_merge.outputs.pr_index }} - ${{ gitea.ref_name }}' - issue-body: | - "Autobots, roll out!" - # docker-compose-deploy: # name: Merge and Deploy # runs-on: ubuntu-latest From 1c3fe4cf5130fdf225ddf4b70e8c9ba7bce409a0 Mon Sep 17 00:00:00 2001 From: markdown-update-bot Date: Sun, 12 Jan 2025 18:24:38 +0000 Subject: [PATCH 04/34] Update readme with dynamic data --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 762e32c1..a19fa45a 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ `~> yq '.services | to_entries | map({service: .key, image: .value.image})' docker-compose.yml` -| Service | Image | +| | Service | Image | | --- | --- | | actual_server | docker.io/actualbudget/actual-server:latest | | adguard | adguard/adguardhome:latest | @@ -156,5 +156,6 @@ | zitadel | ghcr.io/zitadel/zitadel:latest | | zitadel-pg-db | postgres:16-alpine | - + | +|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| \ No newline at end of file From d4e710830d7f7f50faf0f4c7f1177c09ab51b8f4 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sun, 12 Jan 2025 17:20:48 -0500 Subject: [PATCH 05/34] Changing merge, deploy trigger, and deployment order. --- .gitea/workflows/deployment.yml | 96 +++++++++++++++------------------ 1 file changed, 43 insertions(+), 53 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 8a2835e8..a94e2767 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -58,7 +58,7 @@ jobs: - name: Generate .env file for linting run: | - vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env + vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env - name: Docker Compose Lint uses: yu-ichiro/spin-up-docker-compose-action@v1 @@ -154,37 +154,13 @@ jobs: markdown_text: | ${{ steps.service-table.outputs.table }} - deployment-trigger: - name: Deployment Trigger + merge-and-trigger: + name: Merge PR & Trigger Deployment needs: [generate-readme, docker-compose-test, regenerate-readme] runs-on: ubuntu-latest steps: - - name: Gotify Notification - uses: eikendev/gotify-action@master - with: - gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}' - gotify_app_token: '${{ secrets.RINOA_GOTIFY_TOKEN }}' - notification_title: 'Ready to Deploy' - notification_message: 'Ready to deploy: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/jobs/${{ github.job }}' - - - name: Trigger Deployment - id: deploy-trigger - uses: macnev2013/manual-approval@v1.0.18 - with: - secret: ${{ github.TOKEN }} - approvers: Trez.One - minimum-approvals: 1 - approval-wait: 600 - issue-title: 'Manual Approval for #${{ steps.pr_merge.outputs.pr_index }} - ${{ gitea.ref_name }}' - issue-body: | - "Autobots, roll out!" - - - name: Install tea - uses: supplypike/setup-bin@v4 - with: - uri: 'https://gitea.com/gitea/tea/releases/download/v0.9.2/tea-0.9.2-linux-amd64' - name: 'tea' - version: '0.9.2' + - name: Checkout + uses: actions/checkout@v4 - name: PR Merge id: pr_merge @@ -202,30 +178,44 @@ jobs: if [ "${pr_state}" == "merged" ]; then break - # docker-compose-deploy: - # name: Merge and Deploy - # runs-on: ubuntu-latest - # needs: [deployment-trigger] - # env: - # VAULT_ADDR: ${{ secrets.RINOA_VAULT_ADDR }} - # VAULT_TOKEN: ${{ secrets.RINOA_VAULT_TOKEN }} - # steps: - # - name: Checkout - # uses: actions/checkout@v4 - # with: - # ref: main - - # - name: Install Vault - # uses: cpanato/vault-installer@main + - name: Gotify Notification + uses: eikendev/gotify-action@master + with: + gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}' + gotify_app_token: '${{ secrets.RINOA_GOTIFY_TOKEN }}' + notification_title: 'Ready to Deploy' + notification_message: 'Ready to deploy: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/jobs/${{ github.job }}' - # - name: Generate .env file for deployment - # run: | - # vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env + - name: manual-trigger + id: manual-trigger + uses: benhamiltonpro/manual-trigger@v1 + with: + RUN_NAME: "merge-and-deploy" - # - name: Docker Compose Deployment - # uses: Autom3/docker-deployment-action@3.0.1 - # with: - # remote_docker_host: gitea-deploy@192.168.1.254 - # ssh_private_key: ${{ secrets.RINOA_GITEA_PRIVATE_SSH_KEY }} - # ssh_public_key: ${{ secrets.RINOA_GITEA_PUBLIC_SSH_KEY }} + docker-compose-deploy: + name: Deploy via Docker Compose + runs-on: ubuntu-latest + needs: [deployment-trigger] + env: + VAULT_ADDR: ${{ secrets.RINOA_VAULT_ADDR }} + VAULT_TOKEN: ${{ secrets.RINOA_VAULT_TOKEN }} + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + ref: main + + - name: Install Vault + uses: cpanato/vault-installer@main + + - name: Generate .env file for deployment + run: | + vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env + + - name: Docker Compose Deployment + uses: Autom3/docker-deployment-action@3.0.1 + with: + remote_docker_host: gitea-deploy@192.168.1.254 + ssh_private_key: ${{ secrets.RINOA_GITEA_PRIVATE_SSH_KEY }} + ssh_public_key: ${{ secrets.RINOA_GITEA_PUBLIC_SSH_KEY }} \ No newline at end of file From e52eba0aa18be093c39c73a40148d42d5a1f5ad6 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sun, 12 Jan 2025 17:36:03 -0500 Subject: [PATCH 06/34] Syntax in PR check. --- .gitea/workflows/deployment.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index a94e2767..d7226599 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -26,14 +26,12 @@ jobs: run: | tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} which tea - echo "List all PRs" - tea pr ls --repo ${{ github.repository }} --state all echo "Check if PR exists for ${{ github.ref_name }}" pr_state=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head,state --output csv | egrep ${{ gitea.ref_name }} | awk -F, '{print $4}' | sed -e 's|"||g') - echo "PR_STATE: ${pr_state}" - if [ ${pr_state} != open ]; then + if [ ${pr_state} != 'open' ]; then + echo "PR does not exist, creating..." tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }}" -d "Automated PR for ${{ github.ref_name }}" - elif [ ${pr_state} = open ]; then + elif [ ${pr_state} = 'open' ]; then echo "PR already exists, skipping creation..." fi From 28fbe4417ef6012bfb2072342ed7764fe30fceaf Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sun, 12 Jan 2025 17:50:41 -0500 Subject: [PATCH 07/34] ... --- .gitea/workflows/deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index d7226599..f52275fa 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -193,7 +193,7 @@ jobs: docker-compose-deploy: name: Deploy via Docker Compose runs-on: ubuntu-latest - needs: [deployment-trigger] + needs: [merge-and-trigger] env: VAULT_ADDR: ${{ secrets.RINOA_VAULT_ADDR }} VAULT_TOKEN: ${{ secrets.RINOA_VAULT_TOKEN }} From f044a4cf5214208d2bb21bb311ff780f6f356ecb Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sun, 12 Jan 2025 17:54:34 -0500 Subject: [PATCH 08/34] Syntax fix in PR check. --- .gitea/workflows/deployment.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index f52275fa..f5f0a3f2 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -25,13 +25,13 @@ jobs: id: list-prs run: | tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} - which tea - echo "Check if PR exists for ${{ github.ref_name }}" + tea login default gitea-rinoa + echo "Checking if PR exists for ${{ github.ref_name }}" pr_state=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head,state --output csv | egrep ${{ gitea.ref_name }} | awk -F, '{print $4}' | sed -e 's|"||g') - if [ ${pr_state} != 'open' ]; then + if [ "${pr_state}" != 'open' ]; then echo "PR does not exist, creating..." - tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }}" -d "Automated PR for ${{ github.ref_name }}" - elif [ ${pr_state} = 'open' ]; then + tea pr c -r "${{ github.repository }}" -t "Automated PR for ${{ github.ref_name }}" -d "Automated PR for ${{ github.ref_name }}" + elif [ "${pr_state}" = 'open' ]; then echo "PR already exists, skipping creation..." fi From 7671cb26da142c19147223f23773df8751bdedeb Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sun, 12 Jan 2025 18:36:43 -0500 Subject: [PATCH 09/34] ... --- .gitea/workflows/deployment.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index f5f0a3f2..003727b3 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -186,9 +186,16 @@ jobs: - name: manual-trigger id: manual-trigger - uses: benhamiltonpro/manual-trigger@v1 + uses: trstringer/manual-approval@v1.9.1 with: - RUN_NAME: "merge-and-deploy" + secret: ${{ secrets.BOT_GITEA_TOKEN }} + approvers: Trez.One + minimum-approvals: 1 + issue-title: "Deploying ${{ github.ref_name }} (PR #{{ steps.pr_merge.outputs.pr_index }})" + issue-body: "Testing for now" + exclude-workflow-initiator-as-approver: false + additional-approved-words: '' + additional-denied-words: '' docker-compose-deploy: name: Deploy via Docker Compose @@ -197,6 +204,7 @@ jobs: env: VAULT_ADDR: ${{ secrets.RINOA_VAULT_ADDR }} VAULT_TOKEN: ${{ secrets.RINOA_VAULT_TOKEN }} + environment: approval-environment steps: - name: Checkout uses: actions/checkout@v4 From 83b97b1d909b545f3fa89fe35ec77ca2f9bdf24a Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sun, 12 Jan 2025 18:38:53 -0500 Subject: [PATCH 10/34] ... --- .gitea/workflows/deployment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 003727b3..ebd956d3 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -28,6 +28,7 @@ jobs: tea login default gitea-rinoa echo "Checking if PR exists for ${{ github.ref_name }}" pr_state=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head,state --output csv | egrep ${{ gitea.ref_name }} | awk -F, '{print $4}' | sed -e 's|"||g') + echo "${pr_state}" if [ "${pr_state}" != 'open' ]; then echo "PR does not exist, creating..." tea pr c -r "${{ github.repository }}" -t "Automated PR for ${{ github.ref_name }}" -d "Automated PR for ${{ github.ref_name }}" From 6aafa9edd806ee4ba9030f6a0cb256872cf963a6 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sun, 12 Jan 2025 18:41:18 -0500 Subject: [PATCH 11/34] ... --- .gitea/workflows/deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index ebd956d3..984ec9e5 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -27,7 +27,7 @@ jobs: tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} tea login default gitea-rinoa echo "Checking if PR exists for ${{ github.ref_name }}" - pr_state=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head,state --output csv | egrep ${{ gitea.ref_name }} | awk -F, '{print $4}' | sed -e 's|"||g') + pr_state=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ gitea.ref_name }} | awk -F, '{print $4}' | sed -e 's|"||g') echo "${pr_state}" if [ "${pr_state}" != 'open' ]; then echo "PR does not exist, creating..." From 9cd58314b83760944a3e74f5b0ad156a5e39bd32 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sun, 12 Jan 2025 20:52:12 -0500 Subject: [PATCH 12/34] ... --- .gitea/workflows/deployment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 984ec9e5..12efbbfe 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -148,7 +148,6 @@ jobs: - name: Regenerate README uses: gnpaone/dynamic-update-readme@v1.0.2 with: - table: true marker_text: "SERVICES_LIST" markdown_text: | ${{ steps.service-table.outputs.table }} From 5a6afb1cb73a1fae945de96ec5c941761f297633 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sun, 12 Jan 2025 21:29:47 -0500 Subject: [PATCH 13/34] Re-adding table true value for readme gen. --- .gitea/workflows/deployment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 12efbbfe..984ec9e5 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -148,6 +148,7 @@ jobs: - name: Regenerate README uses: gnpaone/dynamic-update-readme@v1.0.2 with: + table: true marker_text: "SERVICES_LIST" markdown_text: | ${{ steps.service-table.outputs.table }} From cb460137dda5b3041bc5ff2062058f140fb85e85 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 13 Jan 2025 08:52:24 -0500 Subject: [PATCH 14/34] ... --- .gitea/workflows/deployment.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 984ec9e5..9ce08f1e 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -28,7 +28,6 @@ jobs: tea login default gitea-rinoa echo "Checking if PR exists for ${{ github.ref_name }}" pr_state=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ gitea.ref_name }} | awk -F, '{print $4}' | sed -e 's|"||g') - echo "${pr_state}" if [ "${pr_state}" != 'open' ]; then echo "PR does not exist, creating..." tea pr c -r "${{ github.repository }}" -t "Automated PR for ${{ github.ref_name }}" -d "Automated PR for ${{ github.ref_name }}" @@ -148,7 +147,6 @@ jobs: - name: Regenerate README uses: gnpaone/dynamic-update-readme@v1.0.2 with: - table: true marker_text: "SERVICES_LIST" markdown_text: | ${{ steps.service-table.outputs.table }} @@ -205,6 +203,7 @@ jobs: env: VAULT_ADDR: ${{ secrets.RINOA_VAULT_ADDR }} VAULT_TOKEN: ${{ secrets.RINOA_VAULT_TOKEN }} + DOCKER_HOST: tcp://dockerproxy:2375 environment: approval-environment steps: - name: Checkout From 1ca1e40bfd504d1644ba27a6bf223e3756613d54 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 13 Jan 2025 09:04:44 -0500 Subject: [PATCH 15/34] ... --- .gitea/workflows/deployment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 9ce08f1e..2b184c02 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -147,6 +147,7 @@ jobs: - name: Regenerate README uses: gnpaone/dynamic-update-readme@v1.0.2 with: + table: true marker_text: "SERVICES_LIST" markdown_text: | ${{ steps.service-table.outputs.table }} From e94bf2a44af53d232a4bf6f8dfda65599f82d60e Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 13 Jan 2025 12:55:12 -0500 Subject: [PATCH 16/34] Changing auth method for Vault. --- .gitea/workflows/deployment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 2b184c02..03a358a1 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -56,6 +56,7 @@ jobs: - name: Generate .env file for linting run: | + vault login -no-print -method=userpass username=${{ secrets.RINOA_VAULT_USER }} password=${{ secrets.VAULT_GITEA_PASSWORD }} vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env - name: Docker Compose Lint From 270470a4d32ac27af5d97f27bb0952efdecd4328 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 13 Jan 2025 14:31:43 -0500 Subject: [PATCH 17/34] Changing auth method for Vault. --- .gitea/workflows/deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 03a358a1..860192f1 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -56,7 +56,7 @@ jobs: - name: Generate .env file for linting run: | - vault login -no-print -method=userpass username=${{ secrets.RINOA_VAULT_USER }} password=${{ secrets.VAULT_GITEA_PASSWORD }} + vault login -no-print -method=userpass username=${{ secrets.VAULT_GITEA_USER }} password=${{ secrets.VAULT_GITEA_PASSWORD }} vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env - name: Docker Compose Lint From bc34e2bf43da22eb60d21b6903d94670e6378e8a Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 13 Jan 2025 16:07:48 -0500 Subject: [PATCH 18/34] Adding in a read-only token for Vault. --- .gitea/workflows/deployment.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 860192f1..92c345e9 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -41,7 +41,7 @@ jobs: runs-on: ubuntu-latest env: VAULT_ADDR: ${{ secrets.RINOA_VAULT_ADDR }} - VAULT_TOKEN: ${{ secrets.RINOA_VAULT_TOKEN }} + VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }} steps: - name: Checkout uses: actions/checkout@v4 @@ -56,7 +56,6 @@ jobs: - name: Generate .env file for linting run: | - vault login -no-print -method=userpass username=${{ secrets.VAULT_GITEA_USER }} password=${{ secrets.VAULT_GITEA_PASSWORD }} vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env - name: Docker Compose Lint From c4af487a58105ec44ca12496a6ab00d017199906 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 13 Jan 2025 16:20:40 -0500 Subject: [PATCH 19/34] README gen step sporadically not authenticating. --- .gitea/workflows/deployment.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 92c345e9..d689f364 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -147,11 +147,13 @@ jobs: - name: Regenerate README uses: gnpaone/dynamic-update-readme@v1.0.2 with: - table: true marker_text: "SERVICES_LIST" markdown_text: | + ${{ steps.service-table.outputs.table }} + table: true + merge-and-trigger: name: Merge PR & Trigger Deployment needs: [generate-readme, docker-compose-test, regenerate-readme] From 48415e9f2e28385c8619570b0ff09cc61672db9f Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 13 Jan 2025 16:25:05 -0500 Subject: [PATCH 20/34] README gen step sporadically not authenticating. --- .gitea/workflows/deployment.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index d689f364..92c345e9 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -147,13 +147,11 @@ jobs: - name: Regenerate README uses: gnpaone/dynamic-update-readme@v1.0.2 with: + table: true marker_text: "SERVICES_LIST" markdown_text: | - ${{ steps.service-table.outputs.table }} - table: true - merge-and-trigger: name: Merge PR & Trigger Deployment needs: [generate-readme, docker-compose-test, regenerate-readme] From 17c0016fe39ca890307034dddffb80390e3dc066 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 13 Jan 2025 16:50:19 -0500 Subject: [PATCH 21/34] Tweaking README gen with commit_email. --- .gitea/workflows/deployment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 92c345e9..a3207ae1 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -147,6 +147,7 @@ jobs: - name: Regenerate README uses: gnpaone/dynamic-update-readme@v1.0.2 with: + commit_email: noreply@trez.wtf table: true marker_text: "SERVICES_LIST" markdown_text: | From a55d8fa50aff64294d016533e0263cf4401f8c9a Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 13 Jan 2025 17:38:44 -0500 Subject: [PATCH 22/34] Trying reactive-readme action. --- .gitea/workflows/deployment.yml | 21 +++++++++++++-------- README.md | 6 ++---- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index a3207ae1..0e0a074c 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -144,14 +144,20 @@ jobs: with: file: ./services.yml - - name: Regenerate README - uses: gnpaone/dynamic-update-readme@v1.0.2 + - name: Update README + uses: VisualBean/reactive-readme@v1 with: - commit_email: noreply@trez.wtf - table: true - marker_text: "SERVICES_LIST" - markdown_text: | - ${{ steps.service-table.outputs.table }} + value: ${{ steps.service-table.outputs.table }} + section: services + + # - name: Regenerate README + # uses: gnpaone/dynamic-update-readme@v1.0.2 + # with: + # commit_email: noreply@trez.wtf + # table: true + # marker_text: "SERVICES_LIST" + # markdown_text: | + # ${{ steps.service-table.outputs.table }} merge-and-trigger: name: Merge PR & Trigger Deployment @@ -226,4 +232,3 @@ jobs: remote_docker_host: gitea-deploy@192.168.1.254 ssh_private_key: ${{ secrets.RINOA_GITEA_PRIVATE_SSH_KEY }} ssh_public_key: ${{ secrets.RINOA_GITEA_PUBLIC_SSH_KEY }} - \ No newline at end of file diff --git a/README.md b/README.md index a19fa45a..d0117584 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ `~> yq '.services | to_entries | map({service: .key, image: .value.image})' docker-compose.yml` - + | | Service | Image | | --- | --- | | actual_server | docker.io/actualbudget/actual-server:latest | @@ -156,6 +156,4 @@ | zitadel | ghcr.io/zitadel/zitadel:latest | | zitadel-pg-db | postgres:16-alpine | - | -|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| - \ No newline at end of file + \ No newline at end of file From 5a754a31bee5327dc0e7b752dc1e564b654ceca6 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 13 Jan 2025 17:44:03 -0500 Subject: [PATCH 23/34] README gen step sporadically not authenticating. --- .gitea/workflows/deployment.yml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 0e0a074c..0a5c2fac 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -144,20 +144,15 @@ jobs: with: file: ./services.yml - - name: Update README - uses: VisualBean/reactive-readme@v1 + - name: Regenerate README + uses: gnpaone/dynamic-update-readme@v1.0.2 with: - value: ${{ steps.service-table.outputs.table }} - section: services - - # - name: Regenerate README - # uses: gnpaone/dynamic-update-readme@v1.0.2 - # with: - # commit_email: noreply@trez.wtf - # table: true - # marker_text: "SERVICES_LIST" - # markdown_text: | - # ${{ steps.service-table.outputs.table }} + commit_email: noreply@trez.wtf + table: true + marker_text: "SERVICES_LIST" + markdown_text: | + ${{ steps.service-table.outputs.table }} + __________________________________________________ merge-and-trigger: name: Merge PR & Trigger Deployment From 0cd149bd8b9f290c76790d6cc0579f2345464ca2 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 14 Jan 2025 08:22:38 -0500 Subject: [PATCH 24/34] Removing commit_email input from readme gen step. --- .gitea/workflows/deployment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 0a5c2fac..4e19ee77 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -147,7 +147,6 @@ jobs: - name: Regenerate README uses: gnpaone/dynamic-update-readme@v1.0.2 with: - commit_email: noreply@trez.wtf table: true marker_text: "SERVICES_LIST" markdown_text: | From 4d6299a94d34ea5d0b1df1740af5f4f5777c91a6 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 14 Jan 2025 08:34:24 -0500 Subject: [PATCH 25/34] Adding in a separate add/commit step for README gen. --- .gitea/workflows/deployment.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 4e19ee77..6eba351a 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -127,6 +127,8 @@ jobs: name: Update README runs-on: ubuntu-latest needs: [cloudflare-dns-setup] + outputs: + pr-pushed: ${{ steps.commit-readme.outputs.pushed }} steps: - name: Checkout uses: actions/checkout@v4 @@ -151,10 +153,18 @@ jobs: marker_text: "SERVICES_LIST" markdown_text: | ${{ steps.service-table.outputs.table }} - __________________________________________________ + confirm_and_push: false + + - name: Add/Commit README.md + id: commit-readme + uses: EndBug/add-and-commit@v9 + with: + message: "chore: Update README" + add: "README.md" merge-and-trigger: name: Merge PR & Trigger Deployment + if: ${{ regenerate-readme.outputs.pr-pushed == 'true' }} needs: [generate-readme, docker-compose-test, regenerate-readme] runs-on: ubuntu-latest steps: From fe36d69617f6c3d9092fd2e2985bfda93c99febf Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 14 Jan 2025 08:42:22 -0500 Subject: [PATCH 26/34] More inputs for README regen. --- .gitea/workflows/deployment.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 6eba351a..22ed16c4 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -150,6 +150,9 @@ jobs: uses: gnpaone/dynamic-update-readme@v1.0.2 with: table: true + commit_user: markdown-update-bot + commit_email: bot@github.com + commit_message: "chore: Update README" marker_text: "SERVICES_LIST" markdown_text: | ${{ steps.service-table.outputs.table }} From dbab8078376ffbbecfd3e448240944bec9ac6190 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 14 Jan 2025 09:41:47 -0500 Subject: [PATCH 27/34] Switching from action to run for generating README. --- .gitea/workflows/deployment.yml | 147 +++++++++++++++----------------- 1 file changed, 71 insertions(+), 76 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 22ed16c4..3b166d1d 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -147,16 +147,11 @@ jobs: file: ./services.yml - name: Regenerate README - uses: gnpaone/dynamic-update-readme@v1.0.2 - with: - table: true - commit_user: markdown-update-bot - commit_email: bot@github.com - commit_message: "chore: Update README" - marker_text: "SERVICES_LIST" - markdown_text: | - ${{ steps.service-table.outputs.table }} - confirm_and_push: false + run: | + echo "# List of Services" > README.md + echo "___________________________________________" >> README.md + echo -e "\n\n" >> README.md + echo "${{ steps.service-table.outputs.table }}" >> README.md - name: Add/Commit README.md id: commit-readme @@ -165,77 +160,77 @@ jobs: message: "chore: Update README" add: "README.md" - merge-and-trigger: - name: Merge PR & Trigger Deployment - if: ${{ regenerate-readme.outputs.pr-pushed == 'true' }} - needs: [generate-readme, docker-compose-test, regenerate-readme] - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 + # merge-and-trigger: + # name: Merge PR & Trigger Deployment + # if: ${{ regenerate-readme.outputs.pr-pushed == 'true' }} + # needs: [generate-readme, docker-compose-test, regenerate-readme] + # runs-on: ubuntu-latest + # steps: + # - name: Checkout + # uses: actions/checkout@v4 - - name: PR Merge - id: pr_merge - run: | - tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} - tea login default gitea-rinoa - pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ gitea.ref_name }} | awk -F, '{print $1}' | sed -e 's|"||g') - tea pr m --repo ${{ github.repository }} --title "Auto Merge of PR #${pr_index} - ${{ gitea.ref_name }}" --message "Merged by ${{ gitea.actor }}" --output table ${pr_index} - echo "pr_index=${pr_index}" >> $GITHUB_OUTPUT + # - name: PR Merge + # id: pr_merge + # run: | + # tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} + # tea login default gitea-rinoa + # pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ gitea.ref_name }} | awk -F, '{print $1}' | sed -e 's|"||g') + # tea pr m --repo ${{ github.repository }} --title "Auto Merge of PR #${pr_index} - ${{ gitea.ref_name }}" --message "Merged by ${{ gitea.actor }}" --output table ${pr_index} + # echo "pr_index=${pr_index}" >> $GITHUB_OUTPUT - - name: Wait for PR to be merged - run: | - while true; do - pr_state=$(tea pr ls --repo ${{ github.repository }} --state merged --fields index,title,head,state --output csv | egrep ${{ github.ref_name }} | awk -F, '{print $4}' | sed -e 's|"||g') - if [ "${pr_state}" == "merged" ]; then - break + # - name: Wait for PR to be merged + # run: | + # while true; do + # pr_state=$(tea pr ls --repo ${{ github.repository }} --state merged --fields index,title,head,state --output csv | egrep ${{ github.ref_name }} | awk -F, '{print $4}' | sed -e 's|"||g') + # if [ "${pr_state}" == "merged" ]; then + # break - - name: Gotify Notification - uses: eikendev/gotify-action@master - with: - gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}' - gotify_app_token: '${{ secrets.RINOA_GOTIFY_TOKEN }}' - notification_title: 'Ready to Deploy' - notification_message: 'Ready to deploy: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/jobs/${{ github.job }}' + # - name: Gotify Notification + # uses: eikendev/gotify-action@master + # with: + # gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}' + # gotify_app_token: '${{ secrets.RINOA_GOTIFY_TOKEN }}' + # notification_title: 'Ready to Deploy' + # notification_message: 'Ready to deploy: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/jobs/${{ github.job }}' - - name: manual-trigger - id: manual-trigger - uses: trstringer/manual-approval@v1.9.1 - with: - secret: ${{ secrets.BOT_GITEA_TOKEN }} - approvers: Trez.One - minimum-approvals: 1 - issue-title: "Deploying ${{ github.ref_name }} (PR #{{ steps.pr_merge.outputs.pr_index }})" - issue-body: "Testing for now" - exclude-workflow-initiator-as-approver: false - additional-approved-words: '' - additional-denied-words: '' + # - name: manual-trigger + # id: manual-trigger + # uses: trstringer/manual-approval@v1.9.1 + # with: + # secret: ${{ secrets.BOT_GITEA_TOKEN }} + # approvers: Trez.One + # minimum-approvals: 1 + # issue-title: "Deploying ${{ github.ref_name }} (PR #{{ steps.pr_merge.outputs.pr_index }})" + # issue-body: "Testing for now" + # exclude-workflow-initiator-as-approver: false + # additional-approved-words: '' + # additional-denied-words: '' - docker-compose-deploy: - name: Deploy via Docker Compose - runs-on: ubuntu-latest - needs: [merge-and-trigger] - env: - VAULT_ADDR: ${{ secrets.RINOA_VAULT_ADDR }} - VAULT_TOKEN: ${{ secrets.RINOA_VAULT_TOKEN }} - DOCKER_HOST: tcp://dockerproxy:2375 - environment: approval-environment - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - ref: main + # docker-compose-deploy: + # name: Deploy via Docker Compose + # runs-on: ubuntu-latest + # needs: [merge-and-trigger] + # env: + # VAULT_ADDR: ${{ secrets.RINOA_VAULT_ADDR }} + # VAULT_TOKEN: ${{ secrets.RINOA_VAULT_TOKEN }} + # DOCKER_HOST: tcp://dockerproxy:2375 + # environment: approval-environment + # steps: + # - name: Checkout + # uses: actions/checkout@v4 + # with: + # ref: main - - name: Install Vault - uses: cpanato/vault-installer@main + # - name: Install Vault + # uses: cpanato/vault-installer@main - - name: Generate .env file for deployment - run: | - vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env + # - name: Generate .env file for deployment + # run: | + # vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env - - name: Docker Compose Deployment - uses: Autom3/docker-deployment-action@3.0.1 - with: - remote_docker_host: gitea-deploy@192.168.1.254 - ssh_private_key: ${{ secrets.RINOA_GITEA_PRIVATE_SSH_KEY }} - ssh_public_key: ${{ secrets.RINOA_GITEA_PUBLIC_SSH_KEY }} + # - name: Docker Compose Deployment + # uses: Autom3/docker-deployment-action@3.0.1 + # with: + # remote_docker_host: gitea-deploy@192.168.1.254 + # ssh_private_key: ${{ secrets.RINOA_GITEA_PRIVATE_SSH_KEY }} + # ssh_public_key: ${{ secrets.RINOA_GITEA_PUBLIC_SSH_KEY }} From ba94ab6d615e2d8d37e72092a8495ada6f6ddfda Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 14 Jan 2025 14:44:35 +0000 Subject: [PATCH 28/34] chore: Update README --- README.md | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index d0117584..89e32cc1 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # List of Services +___________________________________________ -`~> yq '.services | to_entries | map({service: .key, image: .value.image})' docker-compose.yml` - -| | Service | Image | + +| Service | Image | | --- | --- | | actual_server | docker.io/actualbudget/actual-server:latest | | adguard | adguard/adguardhome:latest | @@ -60,12 +60,12 @@ | it-tools | ghcr.io/corentinth/it-tools:latest | | jellyfin | jellyfin/jellyfin | | jitsi-etherpad | etherpad/etherpad:1.8.6 | -| jitsi-jibri | jitsi/jibri:${JITSI_IMAGE_VERSION:-stable} | -| jitsi-jicofo | jitsi/jicofo:${JITSI_IMAGE_VERSION:-stable} | -| jitsi-jigasi | jitsi/jigasi:${JITSI_IMAGE_VERSION:-stable} | -| jitsi-jvb | jitsi/jvb:${JITSI_IMAGE_VERSION:-stable} | -| jitsi-prosody | jitsi/prosody:${JITSI_IMAGE_VERSION:-stable} | -| jitsi-web | jitsi/web:${JITSI_IMAGE_VERSION:-stable} | +| jitsi-jibri | jitsi/jibri:stable | +| jitsi-jicofo | jitsi/jicofo:stable | +| jitsi-jigasi | jitsi/jigasi:stable | +| jitsi-jvb | jitsi/jvb:stable | +| jitsi-prosody | jitsi/prosody:stable | +| jitsi-web | jitsi/web:stable | | joplin-db | postgres:17-alpine | | joplin | joplin/server:latest | | komodo-core | ghcr.io/mbecker20/komodo:latest | @@ -136,24 +136,23 @@ | wallos | bellamy/wallos:latest | | watchtower | ghcr.io/containrrr/watchtower:latest | | wazuh.agent | opennix/wazuh-agent:latest | -| wazuh.dashboard | wazuh/wazuh-dashboard:${WAZUH_VERSION} | -| wazuh.indexer | wazuh/wazuh-indexer:${WAZUH_VERSION} | -| wazuh.manager | wazuh/wazuh-manager:${WAZUH_VERSION} | +| wazuh.dashboard | wazuh/wazuh-dashboard: | +| wazuh.indexer | wazuh/wazuh-indexer: | +| wazuh.manager | wazuh/wazuh-manager: | | web-check | lissy93/web-check | | whodb | clidey/whodb | | your_spotify | lscr.io/linuxserver/your_spotify:latest | | youtubedl | nbr23/youtube-dl-server:latest | -| zammad-backup | postgres:${ZAMMAD_POSTGRES_VERSION} | -| zammad-elasticsearch | bitnami/elasticsearch:${ZAMMAD_ELASTICSEARCH_VERSION} | -| zammad-init | ${ZAMMAD_IMAGE_REPO}:${ZAMMAD_VERSION} | -| zammad-memcached | memcached:${ZAMMAD_MEMCACHE_VERSION} | -| zammad-nginx | ${ZAMMAD_IMAGE_REPO}:${ZAMMAD_VERSION} | -| zammad-postgresql | postgres:${ZAMMAD_POSTGRES_VERSION} | -| zammad-railsserver | ${ZAMMAD_IMAGE_REPO}:${ZAMMAD_VERSION} | -| zammad-redis | redis:${ZAMMAD_REDIS_VERSION} | -| zammad-scheduler | ${ZAMMAD_IMAGE_REPO}:${ZAMMAD_VERSION} | -| zammad-websocket | ${ZAMMAD_IMAGE_REPO}:${ZAMMAD_VERSION} | +| zammad-backup | postgres: | +| zammad-elasticsearch | bitnami/elasticsearch: | +| zammad-init | : | +| zammad-memcached | memcached: | +| zammad-nginx | : | +| zammad-postgresql | postgres: | +| zammad-railsserver | : | +| zammad-redis | redis: | +| zammad-scheduler | : | +| zammad-websocket | : | | zitadel | ghcr.io/zitadel/zitadel:latest | | zitadel-pg-db | postgres:16-alpine | - \ No newline at end of file From 40da232294496b1210d58a9b1fed57c0167fb51d Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 14 Jan 2025 09:46:40 -0500 Subject: [PATCH 29/34] Re-adding trigger. --- .gitea/workflows/deployment.yml | 83 ++++++++++++++++----------------- 1 file changed, 41 insertions(+), 42 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 3b166d1d..13813768 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -149,7 +149,6 @@ jobs: - name: Regenerate README run: | echo "# List of Services" > README.md - echo "___________________________________________" >> README.md echo -e "\n\n" >> README.md echo "${{ steps.service-table.outputs.table }}" >> README.md @@ -160,51 +159,51 @@ jobs: message: "chore: Update README" add: "README.md" - # merge-and-trigger: - # name: Merge PR & Trigger Deployment - # if: ${{ regenerate-readme.outputs.pr-pushed == 'true' }} - # needs: [generate-readme, docker-compose-test, regenerate-readme] - # runs-on: ubuntu-latest - # steps: - # - name: Checkout - # uses: actions/checkout@v4 + trigger-and-merge: + name: Merge PR & Trigger Deployment + if: ${{ regenerate-readme.outputs.pr-pushed == 'true' }} + needs: [generate-readme, docker-compose-test, regenerate-readme] + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 - # - name: PR Merge - # id: pr_merge - # run: | - # tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} - # tea login default gitea-rinoa - # pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ gitea.ref_name }} | awk -F, '{print $1}' | sed -e 's|"||g') - # tea pr m --repo ${{ github.repository }} --title "Auto Merge of PR #${pr_index} - ${{ gitea.ref_name }}" --message "Merged by ${{ gitea.actor }}" --output table ${pr_index} - # echo "pr_index=${pr_index}" >> $GITHUB_OUTPUT + - name: Gotify Notification + uses: eikendev/gotify-action@master + with: + gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}' + gotify_app_token: '${{ secrets.RINOA_GOTIFY_TOKEN }}' + notification_title: 'Ready to Deploy' + notification_message: 'Ready to deploy: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/jobs/${{ github.job }}' - # - name: Wait for PR to be merged - # run: | - # while true; do - # pr_state=$(tea pr ls --repo ${{ github.repository }} --state merged --fields index,title,head,state --output csv | egrep ${{ github.ref_name }} | awk -F, '{print $4}' | sed -e 's|"||g') - # if [ "${pr_state}" == "merged" ]; then - # break + - name: manual-trigger + id: manual-trigger + uses: trstringer/manual-approval@v1.9.1 + with: + secret: ${{ secrets.BOT_GITEA_TOKEN }} + approvers: Trez.One + minimum-approvals: 1 + issue-title: "Deploying ${{ github.ref_name }} (PR #{{ steps.pr_merge.outputs.pr_index }})" + issue-body: "Testing for now" + exclude-workflow-initiator-as-approver: false + additional-approved-words: '' + additional-denied-words: '' - # - name: Gotify Notification - # uses: eikendev/gotify-action@master - # with: - # gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}' - # gotify_app_token: '${{ secrets.RINOA_GOTIFY_TOKEN }}' - # notification_title: 'Ready to Deploy' - # notification_message: 'Ready to deploy: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/jobs/${{ github.job }}' + # - name: PR Merge + # id: pr_merge + # run: | + # tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} + # tea login default gitea-rinoa + # pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ gitea.ref_name }} | awk -F, '{print $1}' | sed -e 's|"||g') + # tea pr m --repo ${{ github.repository }} --title "Auto Merge of PR #${pr_index} - ${{ gitea.ref_name }}" --message "Merged by ${{ gitea.actor }}" --output table ${pr_index} + # echo "pr_index=${pr_index}" >> $GITHUB_OUTPUT - # - name: manual-trigger - # id: manual-trigger - # uses: trstringer/manual-approval@v1.9.1 - # with: - # secret: ${{ secrets.BOT_GITEA_TOKEN }} - # approvers: Trez.One - # minimum-approvals: 1 - # issue-title: "Deploying ${{ github.ref_name }} (PR #{{ steps.pr_merge.outputs.pr_index }})" - # issue-body: "Testing for now" - # exclude-workflow-initiator-as-approver: false - # additional-approved-words: '' - # additional-denied-words: '' + # - name: Wait for PR to be merged + # run: | + # while true; do + # pr_state=$(tea pr ls --repo ${{ github.repository }} --state merged --fields index,title,head,state --output csv | egrep ${{ github.ref_name }} | awk -F, '{print $4}' | sed -e 's|"||g') + # if [ "${pr_state}" == "merged" ]; then + # break # docker-compose-deploy: # name: Deploy via Docker Compose From 3b8b9300270e6596b8661979b2e9191288506d6e Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 14 Jan 2025 14:49:48 +0000 Subject: [PATCH 30/34] chore: Update README --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 89e32cc1..cb1e9cf3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ # List of Services -___________________________________________ From 4a2637da7edbd8ea5d06bb7c1b27ad14b54a881f Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 14 Jan 2025 09:50:36 -0500 Subject: [PATCH 31/34] Re-adding trigger. --- .gitea/workflows/deployment.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 13813768..b3d94eae 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -160,8 +160,7 @@ jobs: add: "README.md" trigger-and-merge: - name: Merge PR & Trigger Deployment - if: ${{ regenerate-readme.outputs.pr-pushed == 'true' }} + name: Trigger Deployment needs: [generate-readme, docker-compose-test, regenerate-readme] runs-on: ubuntu-latest steps: From 2dbe6b7a3bd58c9565d7479fca96df23fcb21ff1 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 14 Jan 2025 10:14:52 -0500 Subject: [PATCH 32/34] Breaking out merge and trigger into separate jobs (testing trigger). --- .gitea/workflows/deployment.yml | 64 ++++++++++++++++----------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index b3d94eae..370acad4 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -159,14 +159,13 @@ jobs: message: "chore: Update README" add: "README.md" - trigger-and-merge: - name: Trigger Deployment - needs: [generate-readme, docker-compose-test, regenerate-readme] + manual-trigger-deploy: + name: Manual Trigger + needs: [docker-compose-test, cloudflare-dns-setup, regenerate-readme] + outputs: + CONTINUE_JOBS: ${{ steps.manual-trigger.outputs.CONTINUE_JOBS }} runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Gotify Notification uses: eikendev/gotify-action@master with: @@ -175,42 +174,43 @@ jobs: notification_title: 'Ready to Deploy' notification_message: 'Ready to deploy: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/jobs/${{ github.job }}' - - name: manual-trigger + - name: Manual Trigger + uses: benhamiltonpro/manual-trigger@v1.0.2 id: manual-trigger - uses: trstringer/manual-approval@v1.9.1 with: - secret: ${{ secrets.BOT_GITEA_TOKEN }} - approvers: Trez.One - minimum-approvals: 1 - issue-title: "Deploying ${{ github.ref_name }} (PR #{{ steps.pr_merge.outputs.pr_index }})" - issue-body: "Testing for now" - exclude-workflow-initiator-as-approver: false - additional-approved-words: '' - additional-denied-words: '' + RUN_NAME: "pr-merge" - # - name: PR Merge - # id: pr_merge - # run: | - # tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} - # tea login default gitea-rinoa - # pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ gitea.ref_name }} | awk -F, '{print $1}' | sed -e 's|"||g') - # tea pr m --repo ${{ github.repository }} --title "Auto Merge of PR #${pr_index} - ${{ gitea.ref_name }}" --message "Merged by ${{ gitea.actor }}" --output table ${pr_index} - # echo "pr_index=${pr_index}" >> $GITHUB_OUTPUT + pr-merge: + name: Trigger Deployment + if: ${{ needs.manual-trigger-deploy.outputs.CONTINUE_JOBS == 'true' }} + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 - # - name: Wait for PR to be merged - # run: | - # while true; do - # pr_state=$(tea pr ls --repo ${{ github.repository }} --state merged --fields index,title,head,state --output csv | egrep ${{ github.ref_name }} | awk -F, '{print $4}' | sed -e 's|"||g') - # if [ "${pr_state}" == "merged" ]; then - # break + # - name: PR Merge + # id: pr_merge + # run: | + # tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} + # tea login default gitea-rinoa + # pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ gitea.ref_name }} | awk -F, '{print $1}' | sed -e 's|"||g') + # tea pr m --repo ${{ github.repository }} --title "Auto Merge of PR #${pr_index} - ${{ gitea.ref_name }}" --message "Merged by ${{ gitea.actor }}" --output table ${pr_index} + # echo "pr_index=${pr_index}" >> $GITHUB_OUTPUT + + # - name: Wait for PR to be merged + # run: | + # while true; do + # pr_state=$(tea pr ls --repo ${{ github.repository }} --state merged --fields index,title,head,state --output csv | egrep ${{ github.ref_name }} | awk -F, '{print $4}' | sed -e 's|"||g') + # if [ "${pr_state}" == "merged" ]; then + # break # docker-compose-deploy: # name: Deploy via Docker Compose # runs-on: ubuntu-latest - # needs: [merge-and-trigger] + # needs: [pr-merge] # env: # VAULT_ADDR: ${{ secrets.RINOA_VAULT_ADDR }} - # VAULT_TOKEN: ${{ secrets.RINOA_VAULT_TOKEN }} + # VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }} # DOCKER_HOST: tcp://dockerproxy:2375 # environment: approval-environment # steps: From f684f60e95aa54ab0e40342b59171ab08e012fae Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 14 Jan 2025 10:28:18 -0500 Subject: [PATCH 33/34] Removing manual trigger... --- .gitea/workflows/deployment.yml | 102 +++++++++++++------------------- 1 file changed, 40 insertions(+), 62 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 370acad4..d4c7002d 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -159,76 +159,54 @@ jobs: message: "chore: Update README" add: "README.md" - manual-trigger-deploy: - name: Manual Trigger - needs: [docker-compose-test, cloudflare-dns-setup, regenerate-readme] - outputs: - CONTINUE_JOBS: ${{ steps.manual-trigger.outputs.CONTINUE_JOBS }} - runs-on: ubuntu-latest - steps: - - name: Gotify Notification - uses: eikendev/gotify-action@master - with: - gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}' - gotify_app_token: '${{ secrets.RINOA_GOTIFY_TOKEN }}' - notification_title: 'Ready to Deploy' - notification_message: 'Ready to deploy: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/jobs/${{ github.job }}' - - - name: Manual Trigger - uses: benhamiltonpro/manual-trigger@v1.0.2 - id: manual-trigger - with: - RUN_NAME: "pr-merge" - pr-merge: - name: Trigger Deployment - if: ${{ needs.manual-trigger-deploy.outputs.CONTINUE_JOBS == 'true' }} + name: PR Merge + needs: [regenerate-readme] runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v4 - # - name: PR Merge - # id: pr_merge - # run: | - # tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} - # tea login default gitea-rinoa - # pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ gitea.ref_name }} | awk -F, '{print $1}' | sed -e 's|"||g') - # tea pr m --repo ${{ github.repository }} --title "Auto Merge of PR #${pr_index} - ${{ gitea.ref_name }}" --message "Merged by ${{ gitea.actor }}" --output table ${pr_index} - # echo "pr_index=${pr_index}" >> $GITHUB_OUTPUT + - name: PR Merge + id: pr_merge + run: | + tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} + tea login default gitea-rinoa + pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ gitea.ref_name }} | awk -F, '{print $1}' | sed -e 's|"||g') + tea pr m --repo ${{ github.repository }} --title "Auto Merge of PR #${pr_index} - ${{ gitea.ref_name }}" --message "Merged by ${{ gitea.actor }}" --output table ${pr_index} + echo "pr_index=${pr_index}" >> $GITHUB_OUTPUT - # - name: Wait for PR to be merged - # run: | - # while true; do - # pr_state=$(tea pr ls --repo ${{ github.repository }} --state merged --fields index,title,head,state --output csv | egrep ${{ github.ref_name }} | awk -F, '{print $4}' | sed -e 's|"||g') - # if [ "${pr_state}" == "merged" ]; then - # break + - name: Wait for PR to be merged + run: | + while true; do + pr_state=$(tea pr ls --repo ${{ github.repository }} --state merged --fields index,title,head,state --output csv | egrep ${{ github.ref_name }} | awk -F, '{print $4}' | sed -e 's|"||g') + if [ "${pr_state}" == "merged" ]; then + break - # docker-compose-deploy: - # name: Deploy via Docker Compose - # runs-on: ubuntu-latest - # needs: [pr-merge] - # env: - # VAULT_ADDR: ${{ secrets.RINOA_VAULT_ADDR }} - # VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }} - # DOCKER_HOST: tcp://dockerproxy:2375 - # environment: approval-environment - # steps: - # - name: Checkout - # uses: actions/checkout@v4 - # with: - # ref: main + docker-compose-deploy: + name: Deploy via Docker Compose + runs-on: ubuntu-latest + needs: [pr-merge] + env: + VAULT_ADDR: ${{ secrets.RINOA_VAULT_ADDR }} + VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }} + DOCKER_HOST: tcp://dockerproxy:2375 + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + ref: main - # - name: Install Vault - # uses: cpanato/vault-installer@main + - name: Install Vault + uses: cpanato/vault-installer@main - # - name: Generate .env file for deployment - # run: | - # vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env + - name: Generate .env file for deployment + run: | + vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env - # - name: Docker Compose Deployment - # uses: Autom3/docker-deployment-action@3.0.1 - # with: - # remote_docker_host: gitea-deploy@192.168.1.254 - # ssh_private_key: ${{ secrets.RINOA_GITEA_PRIVATE_SSH_KEY }} - # ssh_public_key: ${{ secrets.RINOA_GITEA_PUBLIC_SSH_KEY }} + - name: Docker Compose Deployment + uses: Autom3/docker-deployment-action@3.0.1 + with: + remote_docker_host: gitea-deploy@192.168.1.254 + ssh_private_key: ${{ secrets.RINOA_GITEA_PRIVATE_SSH_KEY }} + ssh_public_key: ${{ secrets.RINOA_GITEA_PUBLIC_SSH_KEY }} From 1f549f331ffa9371acf774f876a5bd3ae274345f Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 14 Jan 2025 10:33:44 -0500 Subject: [PATCH 34/34] Forgot to add tea install for PR merge job. --- .gitea/workflows/deployment.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index d4c7002d..6824075f 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -166,6 +166,13 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + + - name: Install tea + uses: supplypike/setup-bin@v4 + with: + uri: 'https://gitea.com/gitea/tea/releases/download/v0.9.2/tea-0.9.2-linux-amd64' + name: 'tea' + version: '0.9.2' - name: PR Merge id: pr_merge