From 3009503b3d5ef5e78cfa88cea5dda9d9b9a07e79 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 9 Jan 2025 13:32:44 -0500 Subject: [PATCH 01/26] ... --- .gitea/workflows/deployment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 3e154bcb..95c325c9 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -154,7 +154,7 @@ jobs: deployment-trigger: name: Deployment Trigger - needs: [generate-readme] + needs: [generate-readme, docker-compose-test, regenerate-readme] runs-on: ubuntu-latest outputs: CONTINUE_JOBS: ${{ steps.deploy-trigger.outputs.CONTINUE_JOBS }} @@ -188,7 +188,7 @@ jobs: docker-compose-deploy: name: Merge and Deploy - if: ${{ needs.deployment-trigger.outputs.CONTINUE_JOB == 'manual-step' }} + if: ${{ needs.deployment-trigger.outputs.CONTINUE_JOBS == 'true' }} runs-on: ubuntu-latest needs: [deployment-trigger] env: From 557f57cb0f3f918b15d652b28f2610f82e0b7647 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 9 Jan 2025 14:00:26 -0500 Subject: [PATCH 02/26] ... --- .gitea/workflows/deployment.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 95c325c9..e028d681 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -171,6 +171,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 }} 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 - name: Gotify Notification uses: eikendev/gotify-action@master @@ -182,9 +183,15 @@ jobs: - name: Trigger Deployment id: deploy-trigger - uses: benhamiltonpro/manual-trigger@v1 + uses: macnev2013/manual-approval@latest with: - RUN_NAME: "docker-compose-deploy" + secret: ${{ github.TOKEN }} + approvers: Trez.One + minimum-approvals: 1 + approval-wait: 600 + issue-title: 'Manual Approval for #${pr_index} - ${{ gitea.ref_name }}' + issue-body: | + "Autobots, roll out!" docker-compose-deploy: name: Merge and Deploy From 77836c62037560fb9018dd1ab08bfe1e0ebf0ccc Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 9 Jan 2025 14:07:42 -0500 Subject: [PATCH 03/26] Converting service list to MD table. --- .gitea/workflows/deployment.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index e028d681..689b74a2 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -132,22 +132,22 @@ jobs: - name: Install yq uses: dcarbone/install-yq-action@v1 - - name: Generate README list - id: readme-list + - name: Generate service list run: | - services_list=$(yq '.services | to_entries | map({"service": .key, "image": .value.image})' docker-compose.yml) - echo "SERVICES_LIST<> $GITHUB_ENV - echo "${services_list}" >> $GITHUB_ENV - echo "EOF" >> $GITHUB_ENV + yq '.services | to_entries | map({"service": .key, "image": .value.image})' docker-compose.yml > services.yml + + - name: Generate Markdown Table + uses: gazab/create-markdown-table@v1 + id: service_table + with: + file: ./services.yml - name: Regenerate README uses: gnpaone/dynamic-update-readme@v1.0.2 with: marker_text: "SERVICES_LIST" markdown_text: | - ```yaml - ${{ env.SERVICES_LIST }} - ```` + ${{ steps.service_table.outputs.table }} commit_email: noreply@trez.wtf commit_username: gitea-sonarqube-bot commit_message: "docs: regenerate README" From 5e2491929cc2d1f748e375a3f3a539b00b433338 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 9 Jan 2025 14:17:39 -0500 Subject: [PATCH 04/26] Troubleshooting create PR step. --- .gitea/workflows/deployment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 689b74a2..d9713ffd 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -169,6 +169,7 @@ jobs: - name: 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 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 From a1e3cd9196b5ecb0ca2c588f8ebdc5034ddf5c44 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 9 Jan 2025 14:33:34 -0500 Subject: [PATCH 05/26] Troubleshooting create PR step. --- .gitea/workflows/deployment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index d9713ffd..0d3e21fc 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -25,6 +25,7 @@ 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 tea login default gitea-rinoa 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') if [ "${pr_state}" != open ]; then From 79f55b93260cac37b47080738dc3239c432ac7f9 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 9 Jan 2025 14:35:51 -0500 Subject: [PATCH 06/26] Troubleshooting create PR step. --- .gitea/workflows/deployment.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 0d3e21fc..159f3058 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -27,6 +27,9 @@ 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 }} which tea tea login default gitea-rinoa + echo "List all PRs" + tea pr ls --state all + echo "Check 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') if [ "${pr_state}" != open ]; then tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }}" -d "Automated PR for ${{ github.ref_name }}" From 90010d1cbc860ddd36ed248ed3f302d6ee15d04d Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 9 Jan 2025 14:39:17 -0500 Subject: [PATCH 07/26] Troubleshooting create PR step. --- .gitea/workflows/deployment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 159f3058..890ef22f 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -26,7 +26,6 @@ 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 - tea login default gitea-rinoa echo "List all PRs" tea pr ls --state all echo "Check if PR exists for ${{ github.ref_name }}" From 70212b88992bd8833d7858f8e6a1462d12e16937 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 9 Jan 2025 14:40:28 -0500 Subject: [PATCH 08/26] Troubleshooting create PR step. --- .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 890ef22f..25e756a5 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 }} which tea echo "List all PRs" - tea pr ls --state all + 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 open --fields index,title,head,state --output csv | egrep ${{ gitea.ref_name }} | awk -F, '{print $4}' | sed -e 's|"||g') if [ "${pr_state}" != open ]; then From 391ae75614b8fe2c23ea49d0d326e53912a7ab74 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 9 Jan 2025 14:43:20 -0500 Subject: [PATCH 09/26] Troubleshooting create PR step. --- .gitea/workflows/deployment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 25e756a5..68547052 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -29,6 +29,7 @@ jobs: echo "List all PRs" tea pr ls --repo ${{ github.repository }} --state all echo "Check if PR exists for ${{ github.ref_name }}" + 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') if [ "${pr_state}" != open ]; then tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }}" -d "Automated PR for ${{ github.ref_name }}" From 991e0768b9bfb147d70d107165b17d2e3dd33651 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 9 Jan 2025 14:48:00 -0500 Subject: [PATCH 10/26] Troubleshooting create PR step. --- .gitea/workflows/deployment.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 68547052..51946307 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -31,9 +31,10 @@ jobs: echo "Check if PR exists for ${{ github.ref_name }}" 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') - if [ "${pr_state}" != open ]; then + echo "PR_STATE: ${pr_state}" + if [ ${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 + elif [ ${pr_state} = open ]; then echo "PR already exists, skipping creation..." fi From 1e49c806e65e1a5f40a8f51b7ba3899d733b39ec Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 9 Jan 2025 14:50:16 -0500 Subject: [PATCH 11/26] Troubleshooting create PR step. --- .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 51946307..600d4038 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -29,8 +29,7 @@ jobs: echo "List all PRs" tea pr ls --repo ${{ github.repository }} --state all echo "Check if PR exists for ${{ github.ref_name }}" - 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') + 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 tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }}" -d "Automated PR for ${{ github.ref_name }}" From 1c4779b3dae7e2223a5175870c25558a1f8bf9ce Mon Sep 17 00:00:00 2001 From: markdown-update-bot Date: Thu, 9 Jan 2025 20:29:38 +0000 Subject: [PATCH 12/26] docs: regenerate README --- README.md | 455 ++++++++++++++++++------------------------------------ 1 file changed, 153 insertions(+), 302 deletions(-) diff --git a/README.md b/README.md index eeb2a223..762e32c1 100644 --- a/README.md +++ b/README.md @@ -3,307 +3,158 @@ `~> yq '.services | to_entries | map({service: .key, image: .value.image})' docker-compose.yml` -```yaml -- service: actual_server - image: docker.io/actualbudget/actual-server:latest -- service: adguard - image: adguard/adguardhome:latest -- service: apprise - image: lscr.io/linuxserver/apprise-api:latest -- service: audiobookshelf - image: ghcr.io/advplyr/audiobookshelf:latest -- service: authelia - image: authelia/authelia:master -- service: authelia-pg - image: postgres:16-alpine -- service: bazarr - image: lscr.io/linuxserver/bazarr:latest -- service: bitmagnet - image: ghcr.io/bitmagnet-io/bitmagnet:latest -- service: bitmagnet-pg-db - image: postgres:17-alpine -- service: bitwarden - image: vaultwarden/server:latest -- service: bluesky-pds - image: ghcr.io/bluesky-social/pds:latest -- service: browserless - image: ghcr.io/browserless/chromium:latest -- service: bunkerweb - image: bunkerity/bunkerweb:latest -- service: bunkerweb-scheduler - image: bunkerity/bunkerweb-scheduler:latest -- service: bunkerweb-ui - image: bunkerity/bunkerweb-ui:latest -- service: castopod - image: castopod/castopod:latest -- service: cloudflared - image: 'cloudflare/cloudflared:latest' -- service: cloudflareddns - image: ghcr.io/hotio/cloudflareddns:latest -- service: crowdsec - image: crowdsecurity/crowdsec:latest -- service: crowdsec-dashboard - image: metabase/metabase -- service: czkawka - image: jlesage/czkawka -- service: dagu-scheduler - image: ghcr.io/dagu-org/dagu:latest -- service: dagu-server - image: ghcr.io/dagu-org/dagu:latest -- service: delugevpn - image: ghcr.io/binhex/arch-delugevpn:latest -- service: docker-socket-proxy - image: ghcr.io/tecnativa/docker-socket-proxy:latest -- service: docuseal - image: docuseal/docuseal:latest -- service: duplicati - image: lscr.io/linuxserver/duplicati:latest -- service: fastenhealth - image: ghcr.io/fastenhealth/fasten-onprem:main -- service: flaresolverr - image: ghcr.io/flaresolverr/flaresolverr:latest -- service: ghost - image: ghost:latest -- service: gitea - image: gitea/gitea:1.22.6 -- service: gitea-db - image: postgres:14 -- service: gitea-opengist - image: ghcr.io/thomiceli/opengist:latest -- service: gitea-runner - image: gitea/act_runner:latest -- service: gitea-sonarqube-bot - image: justusbunsi/gitea-sonarqube-bot:v0.4.0 -- service: gluetun - image: qmcgaw/gluetun:latest -- service: gotify - image: gotify/server -- service: grafana - image: grafana/grafana-enterprise:latest -- service: grafana-alloy - image: grafana/alloy:latest -- service: grafana-loki - image: grafana/loki:latest -- service: grafana-mimir - image: grafana/mimir:latest -- service: grafana-mimir-memcached - image: memcached -- service: grafana-pyroscope - image: grafana/pyroscope:latest -- service: grafana-tempo - image: grafana/tempo:latest -- service: guacamole - image: flcontainers/guacamole:latest -- service: homepage - image: ghcr.io/gethomepage/homepage:latest -- service: hortusfox - image: ghcr.io/danielbrendel/hortusfox-web:latest -- service: hugo - image: hugomods/hugo:exts -- service: invidious - image: quay.io/invidious/invidious:latest -- service: invidious-db - image: docker.io/library/postgres:14 -- service: invoice_ninja - image: invoiceninja/invoiceninja:5 -- service: invoice_ninja_proxy - image: nginx -- service: it-tools - image: ghcr.io/corentinth/it-tools:latest -- service: jellyfin - image: jellyfin/jellyfin -- service: jitsi-etherpad - image: etherpad/etherpad:1.8.6 -- service: jitsi-jibri - image: jitsi/jibri:${JITSI_IMAGE_VERSION:-stable} -- service: jitsi-jicofo - image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-stable} -- service: jitsi-jigasi - image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-stable} -- service: jitsi-jvb - image: jitsi/jvb:${JITSI_IMAGE_VERSION:-stable} -- service: jitsi-prosody - image: jitsi/prosody:${JITSI_IMAGE_VERSION:-stable} -- service: jitsi-web - image: jitsi/web:${JITSI_IMAGE_VERSION:-stable} -- service: joplin-db - image: postgres:17-alpine -- service: joplin - image: joplin/server:latest -- service: komodo-core - image: ghcr.io/mbecker20/komodo:latest -- service: komodo-ferretdb - image: ghcr.io/ferretdb/ferretdb -- service: komodo-periphery - image: ghcr.io/mbecker20/periphery:latest -- service: komodo-pg-db - image: postgres:17-alpine -- service: librespeed - image: lscr.io/linuxserver/librespeed:latest -- service: lidarr - image: lscr.io/linuxserver/lidarr:latest -- service: lidify - image: thewicklowwolf/lidify:latest -- service: lldap - image: lldap/lldap:stable -- service: localai - image: localai/localai:latest-aio-cpu -- service: maloja - image: krateng/maloja:latest -- service: mariadb - image: ghcr.io/linuxserver/mariadb -- service: mastodon-pg-db - image: postgres:17-alpine -- service: minio - image: minio/minio -- service: mongodb - image: mongo:7.0 -- service: multi-scrobbler - image: foxxmd/multi-scrobbler -- service: n8n - image: docker.n8n.io/n8nio/n8n -- service: navidrome - image: deluan/navidrome:latest -- service: netbox - image: lscr.io/linuxserver/netbox:latest -- service: netbox-db - image: postgres:17-alpine -- service: nextcloud - image: lscr.io/linuxserver/nextcloud:latest -- service: ollama - image: ollama/ollama -- service: ombi - image: lscr.io/linuxserver/ombi:latest -- service: paperless-ngx - image: ghcr.io/paperless-ngx/paperless-ngx:latest -- service: plausible - image: ghcr.io/plausible/community-edition:v2.1.0 -- service: plausible_db - image: postgres:16-alpine -- service: plausible_events_db - image: clickhouse/clickhouse-server:24.3.3.102-alpine -- service: postal-smtp - image: ghcr.io/postalserver/postal:latest -- service: postal-web - image: ghcr.io/postalserver/postal:latest -- service: postal-worker - image: ghcr.io/postalserver/postal:latest -- service: prowlarr - image: lscr.io/linuxserver/prowlarr:latest -- service: radarec - image: thewicklowwolf/radarec:latest -- service: radarr - image: lscr.io/linuxserver/radarr:latest -- service: reactive-resume - image: amruthpillai/reactive-resume:latest -- service: reactive-resume-pg - image: postgres:16-alpine -- service: readarr - image: lscr.io/linuxserver/readarr:develop -- service: redis - image: redis:alpine -- service: redlib - image: quay.io/redlib/redlib:latest -- service: sabnzbdvpn - image: ghcr.io/binhex/arch-sabnzbdvpn:latest -- service: scraperr - image: jpyles0524/scraperr:latest -- service: scraperr-api - image: jpyles0524/scraperr_api:latest -- service: scrutiny - image: ghcr.io/analogj/scrutiny:master-omnibus -- service: searxng - image: searxng/searxng:latest -- service: semaphore - image: semaphoreui/semaphore:v2.10.32 -- service: slurpit-portal - image: slurpit/portal:latest -- service: slurpit-scanner - image: slurpit/scanner:latest -- service: slurpit-scraper - image: slurpit/scraper:latest -- service: slurpit-warehouse - image: slurpit/warehouse:latest -- service: sonarqube - image: mc1arke/sonarqube-with-community-branch-plugin:lts -- service: sonarqube-pg-db - image: postgres:17-alpine -- service: sonarr - image: lscr.io/linuxserver/sonarr:latest -- service: sonashow - image: thewicklowwolf/sonashow:latest -- service: soularr - image: mrusse08/soularr:latest -- service: soulseek - image: slskd/slskd -- service: spotisub - image: blastbeng/spotisub:latest -- service: swag - image: lscr.io/linuxserver/swag:latest -- service: synapse - image: docker.io/matrixdotorg/synapse:latest -- service: synapse-db - image: postgres:16-alpine -- service: tandoor - image: vabene1111/recipes -- service: tandoor-pg - image: postgres:16-alpine -- service: traccar - image: traccar/traccar:latest -- service: traccar-pg - image: postgres:16-alpine -- service: unmanic - image: josh5/unmanic:latest -- service: uptimekuma - image: louislam/uptime-kuma:latest -- service: vault - image: hashicorp/vault:latest -- service: wallabag - image: wallabag/wallabag -- service: wallos - image: bellamy/wallos:latest -- service: watchtower - image: ghcr.io/containrrr/watchtower:latest -- service: wazuh.agent - image: opennix/wazuh-agent:latest -- service: wazuh.dashboard - image: wazuh/wazuh-dashboard:${WAZUH_VERSION} -- service: wazuh.indexer - image: wazuh/wazuh-indexer:${WAZUH_VERSION} -- service: wazuh.manager - image: wazuh/wazuh-manager:${WAZUH_VERSION} -- service: web-check - image: lissy93/web-check -- service: whodb - image: clidey/whodb -- service: your_spotify - image: lscr.io/linuxserver/your_spotify:latest -- service: youtubedl - image: nbr23/youtube-dl-server:latest -- service: zammad-backup - image: postgres:${ZAMMAD_POSTGRES_VERSION} -- service: zammad-elasticsearch - image: bitnami/elasticsearch:${ZAMMAD_ELASTICSEARCH_VERSION} -- service: zammad-init - image: ${ZAMMAD_IMAGE_REPO}:${ZAMMAD_VERSION} -- service: zammad-memcached - image: memcached:${ZAMMAD_MEMCACHE_VERSION} -- service: zammad-nginx - image: ${ZAMMAD_IMAGE_REPO}:${ZAMMAD_VERSION} -- service: zammad-postgresql - image: postgres:${ZAMMAD_POSTGRES_VERSION} -- service: zammad-railsserver - image: ${ZAMMAD_IMAGE_REPO}:${ZAMMAD_VERSION} -- service: zammad-redis - image: redis:${ZAMMAD_REDIS_VERSION} -- service: zammad-scheduler - image: ${ZAMMAD_IMAGE_REPO}:${ZAMMAD_VERSION} -- service: zammad-websocket - image: ${ZAMMAD_IMAGE_REPO}:${ZAMMAD_VERSION} -- service: zitadel - image: ghcr.io/zitadel/zitadel:latest -- service: zitadel-pg-db - image: postgres:16-alpine -```` +| Service | Image | +| --- | --- | +| actual_server | docker.io/actualbudget/actual-server:latest | +| adguard | adguard/adguardhome:latest | +| apprise | lscr.io/linuxserver/apprise-api:latest | +| audiobookshelf | ghcr.io/advplyr/audiobookshelf:latest | +| authelia | authelia/authelia:master | +| authelia-pg | postgres:16-alpine | +| bazarr | lscr.io/linuxserver/bazarr:latest | +| bitmagnet | ghcr.io/bitmagnet-io/bitmagnet:latest | +| bitmagnet-pg-db | postgres:17-alpine | +| bitwarden | vaultwarden/server:latest | +| bluesky-pds | ghcr.io/bluesky-social/pds:latest | +| browserless | ghcr.io/browserless/chromium:latest | +| bunkerweb | bunkerity/bunkerweb:latest | +| bunkerweb-scheduler | bunkerity/bunkerweb-scheduler:latest | +| bunkerweb-ui | bunkerity/bunkerweb-ui:latest | +| castopod | castopod/castopod:latest | +| cloudflared | cloudflare/cloudflared:latest | +| cloudflareddns | ghcr.io/hotio/cloudflareddns:latest | +| crowdsec | crowdsecurity/crowdsec:latest | +| crowdsec-dashboard | metabase/metabase | +| czkawka | jlesage/czkawka | +| dagu-scheduler | ghcr.io/dagu-org/dagu:latest | +| dagu-server | ghcr.io/dagu-org/dagu:latest | +| delugevpn | ghcr.io/binhex/arch-delugevpn:latest | +| docker-socket-proxy | ghcr.io/tecnativa/docker-socket-proxy:latest | +| docuseal | docuseal/docuseal:latest | +| duplicati | lscr.io/linuxserver/duplicati:latest | +| fastenhealth | ghcr.io/fastenhealth/fasten-onprem:main | +| flaresolverr | ghcr.io/flaresolverr/flaresolverr:latest | +| ghost | ghost:latest | +| gitea | gitea/gitea:1.22.6 | +| gitea-db | postgres:14 | +| gitea-opengist | ghcr.io/thomiceli/opengist:latest | +| gitea-runner | gitea/act_runner:latest | +| gitea-sonarqube-bot | justusbunsi/gitea-sonarqube-bot:v0.4.0 | +| gluetun | qmcgaw/gluetun:latest | +| gotify | gotify/server | +| grafana | grafana/grafana-enterprise:latest | +| grafana-alloy | grafana/alloy:latest | +| grafana-loki | grafana/loki:latest | +| grafana-mimir | grafana/mimir:latest | +| grafana-mimir-memcached | memcached | +| grafana-pyroscope | grafana/pyroscope:latest | +| grafana-tempo | grafana/tempo:latest | +| guacamole | flcontainers/guacamole:latest | +| homepage | ghcr.io/gethomepage/homepage:latest | +| hortusfox | ghcr.io/danielbrendel/hortusfox-web:latest | +| hugo | hugomods/hugo:exts | +| invidious | quay.io/invidious/invidious:latest | +| invidious-db | docker.io/library/postgres:14 | +| invoice_ninja | invoiceninja/invoiceninja:5 | +| invoice_ninja_proxy | nginx | +| 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} | +| joplin-db | postgres:17-alpine | +| joplin | joplin/server:latest | +| komodo-core | ghcr.io/mbecker20/komodo:latest | +| komodo-ferretdb | ghcr.io/ferretdb/ferretdb | +| komodo-periphery | ghcr.io/mbecker20/periphery:latest | +| komodo-pg-db | postgres:17-alpine | +| librespeed | lscr.io/linuxserver/librespeed:latest | +| lidarr | lscr.io/linuxserver/lidarr:latest | +| lidify | thewicklowwolf/lidify:latest | +| lldap | lldap/lldap:stable | +| localai | localai/localai:latest-aio-cpu | +| maloja | krateng/maloja:latest | +| mariadb | ghcr.io/linuxserver/mariadb | +| mastodon-pg-db | postgres:17-alpine | +| minio | minio/minio | +| mongodb | mongo:7.0 | +| multi-scrobbler | foxxmd/multi-scrobbler | +| n8n | docker.n8n.io/n8nio/n8n | +| navidrome | deluan/navidrome:latest | +| netbox | lscr.io/linuxserver/netbox:latest | +| netbox-db | postgres:17-alpine | +| nextcloud | lscr.io/linuxserver/nextcloud:latest | +| ollama | ollama/ollama | +| ombi | lscr.io/linuxserver/ombi:latest | +| paperless-ngx | ghcr.io/paperless-ngx/paperless-ngx:latest | +| plausible | ghcr.io/plausible/community-edition:v2.1.0 | +| plausible_db | postgres:16-alpine | +| plausible_events_db | clickhouse/clickhouse-server:24.3.3.102-alpine | +| postal-smtp | ghcr.io/postalserver/postal:latest | +| postal-web | ghcr.io/postalserver/postal:latest | +| postal-worker | ghcr.io/postalserver/postal:latest | +| prowlarr | lscr.io/linuxserver/prowlarr:latest | +| radarec | thewicklowwolf/radarec:latest | +| radarr | lscr.io/linuxserver/radarr:latest | +| reactive-resume | amruthpillai/reactive-resume:latest | +| reactive-resume-pg | postgres:16-alpine | +| readarr | lscr.io/linuxserver/readarr:develop | +| redis | redis:alpine | +| redlib | quay.io/redlib/redlib:latest | +| sabnzbdvpn | ghcr.io/binhex/arch-sabnzbdvpn:latest | +| scraperr | jpyles0524/scraperr:latest | +| scraperr-api | jpyles0524/scraperr_api:latest | +| scrutiny | ghcr.io/analogj/scrutiny:master-omnibus | +| searxng | searxng/searxng:latest | +| semaphore | semaphoreui/semaphore:v2.10.32 | +| slurpit-portal | slurpit/portal:latest | +| slurpit-scanner | slurpit/scanner:latest | +| slurpit-scraper | slurpit/scraper:latest | +| slurpit-warehouse | slurpit/warehouse:latest | +| sonarqube | mc1arke/sonarqube-with-community-branch-plugin:lts | +| sonarqube-pg-db | postgres:17-alpine | +| sonarr | lscr.io/linuxserver/sonarr:latest | +| sonashow | thewicklowwolf/sonashow:latest | +| soularr | mrusse08/soularr:latest | +| soulseek | slskd/slskd | +| spotisub | blastbeng/spotisub:latest | +| swag | lscr.io/linuxserver/swag:latest | +| synapse | docker.io/matrixdotorg/synapse:latest | +| synapse-db | postgres:16-alpine | +| tandoor | vabene1111/recipes | +| tandoor-pg | postgres:16-alpine | +| traccar | traccar/traccar:latest | +| traccar-pg | postgres:16-alpine | +| unmanic | josh5/unmanic:latest | +| uptimekuma | louislam/uptime-kuma:latest | +| vault | hashicorp/vault:latest | +| wallabag | wallabag/wallabag | +| 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} | +| 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} | +| zitadel | ghcr.io/zitadel/zitadel:latest | +| zitadel-pg-db | postgres:16-alpine | + \ No newline at end of file From 032f54aa7cd381be7590534239782012c472518d Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 9 Jan 2025 15:35:54 -0500 Subject: [PATCH 13/26] Fixing deployment-trigger job. --- .gitea/workflows/deployment.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 600d4038..6482b751 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -160,8 +160,6 @@ jobs: name: Deployment Trigger needs: [generate-readme, docker-compose-test, regenerate-readme] runs-on: ubuntu-latest - outputs: - CONTINUE_JOBS: ${{ steps.deploy-trigger.outputs.CONTINUE_JOBS }} steps: - name: Install tea uses: supplypike/setup-bin@v4 From 97b9e7c3a5a1bd54cf900a705fcea23e0fd12c42 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 9 Jan 2025 16:21:41 -0500 Subject: [PATCH 14/26] Fixing README gen. --- .gitea/workflows/deployment.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 6482b751..1b1a8347 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -140,18 +140,22 @@ jobs: run: | yq '.services | to_entries | map({"service": .key, "image": .value.image})' docker-compose.yml > services.yml + - run: cat services.yml + - name: Generate Markdown Table uses: gazab/create-markdown-table@v1 - id: service_table + id: service-table with: file: ./services.yml + - run: echo ${{ steps.service-table.outputs.table }} + - name: Regenerate README uses: gnpaone/dynamic-update-readme@v1.0.2 with: marker_text: "SERVICES_LIST" markdown_text: | - ${{ steps.service_table.outputs.table }} + ${{ steps.service-table.outputs.table }} commit_email: noreply@trez.wtf commit_username: gitea-sonarqube-bot commit_message: "docs: regenerate README" From e597260dac60e5362ead16c01f808d694d318ffd Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 9 Jan 2025 16:45:58 -0500 Subject: [PATCH 15/26] Pipes, pipes... --- .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 1b1a8347..97791fa9 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -148,7 +148,7 @@ jobs: with: file: ./services.yml - - run: echo ${{ steps.service-table.outputs.table }} + - run: echo "${{ steps.service-table.outputs.table }}" - name: Regenerate README uses: gnpaone/dynamic-update-readme@v1.0.2 From 5772f4171e3502d7ecb6ab267404ded1e075ca23 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sat, 11 Jan 2025 07:47:05 -0500 Subject: [PATCH 16/26] Testing out manual trigger. --- .gitea/workflows/deployment.yml | 47 ++++++++++++++++----------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 97791fa9..1420fb09 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -200,31 +200,30 @@ jobs: issue-body: | "Autobots, roll out!" - docker-compose-deploy: - name: Merge and Deploy - if: ${{ needs.deployment-trigger.outputs.CONTINUE_JOBS == 'true' }} - 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 + # 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: 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 }} \ No newline at end of file From 83f13f028e0dcc1563d0bf40f4e71e7284f12113 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sat, 11 Jan 2025 09:35:24 -0500 Subject: [PATCH 17/26] Testing out manual trigger. --- .gitea/workflows/deployment.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 1420fb09..fe31d020 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -140,24 +140,20 @@ jobs: run: | yq '.services | to_entries | map({"service": .key, "image": .value.image})' docker-compose.yml > services.yml - - run: cat services.yml - - name: Generate Markdown Table uses: gazab/create-markdown-table@v1 id: service-table with: file: ./services.yml - - run: echo "${{ steps.service-table.outputs.table }}" - - name: Regenerate README uses: gnpaone/dynamic-update-readme@v1.0.2 with: marker_text: "SERVICES_LIST" markdown_text: | ${{ steps.service-table.outputs.table }} - commit_email: noreply@trez.wtf - commit_username: gitea-sonarqube-bot + commit_email: ${{ secrets.CF_API_EMAIL}} + commit_username: Trez.One commit_message: "docs: regenerate README" deployment-trigger: From e27587a1b6d1529476ac3cc4fa268d2b6ae83046 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sat, 11 Jan 2025 09:42:44 -0500 Subject: [PATCH 18/26] Testing out manual trigger. --- .gitea/workflows/deployment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index fe31d020..39f21aac 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -152,8 +152,8 @@ jobs: marker_text: "SERVICES_LIST" markdown_text: | ${{ steps.service-table.outputs.table }} - commit_email: ${{ secrets.CF_API_EMAIL}} - commit_username: Trez.One + commit_email: noreply@trez.wtf + commit_username: gitea-sonarqube-bot commit_message: "docs: regenerate README" deployment-trigger: From 3cd19175edd42c6cfc8d87e77f18d4a585512df1 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sat, 11 Jan 2025 09:51:22 -0500 Subject: [PATCH 19/26] Adjusting README gen step. --- .gitea/workflows/deployment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 39f21aac..e0285a45 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -150,6 +150,7 @@ jobs: uses: gnpaone/dynamic-update-readme@v1.0.2 with: marker_text: "SERVICES_LIST" + table: true markdown_text: | ${{ steps.service-table.outputs.table }} commit_email: noreply@trez.wtf From b6dd26b14f927478f4b1b277ddc33a524798daa7 Mon Sep 17 00:00:00 2001 From: markdown-update-bot Date: Sat, 11 Jan 2025 14:57:57 +0000 Subject: [PATCH 20/26] docs: regenerate README --- 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 cec009fcb1805c2f65dad5e897d45c2853302c0d Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sat, 11 Jan 2025 10:00:46 -0500 Subject: [PATCH 21/26] Correcting reference for deployment trigger action. --- .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 e0285a45..fbfc7bd2 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -187,7 +187,7 @@ jobs: - name: Trigger Deployment id: deploy-trigger - uses: macnev2013/manual-approval@latest + uses: macnev2013/manual-approval@v1.0.18 with: secret: ${{ github.TOKEN }} approvers: Trez.One From 8da5222140efa83ac36f6903faad69e564de2c90 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sat, 11 Jan 2025 19:32:11 -0500 Subject: [PATCH 22/26] Adjusting README gen step. --- .gitea/workflows/deployment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index fbfc7bd2..f60eaacb 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -154,8 +154,8 @@ jobs: markdown_text: | ${{ steps.service-table.outputs.table }} commit_email: noreply@trez.wtf - commit_username: gitea-sonarqube-bot - commit_message: "docs: regenerate README" + commit_user: gitea-sonarqube-bot + commit_message: "Update README with services list" deployment-trigger: name: Deployment Trigger From 30c4d53bdf1f522c0e5b992a37c4bc8a97b1cb72 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sat, 11 Jan 2025 19:38:06 -0500 Subject: [PATCH 23/26] Adjusting README gen step. --- .gitea/workflows/deployment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index f60eaacb..c14e7b29 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -153,8 +153,8 @@ jobs: table: true markdown_text: | ${{ steps.service-table.outputs.table }} - commit_email: noreply@trez.wtf - commit_user: gitea-sonarqube-bot + commit_email: ${{ secrets.CF_API_EMAIL }} + commit_user: Trez.One commit_message: "Update README with services list" deployment-trigger: From 0667d49b1a424c613ff5ab7dfec28a9c426876f4 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sat, 11 Jan 2025 19:47:20 -0500 Subject: [PATCH 24/26] . --- .gitea/workflows/deployment.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index c14e7b29..0807ad72 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -152,9 +152,11 @@ jobs: marker_text: "SERVICES_LIST" table: true markdown_text: | + ${{ steps.service-table.outputs.table }} - commit_email: ${{ secrets.CF_API_EMAIL }} - commit_user: Trez.One + + commit_email: noreply@trez.wtf + commit_user: gitea-sonarqube-bot commit_message: "Update README with services list" deployment-trigger: From ae11234e37af6b0dc0777055db79bc881112f9be Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sat, 11 Jan 2025 20:03:05 -0500 Subject: [PATCH 25/26] . --- .gitea/workflows/deployment.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 0807ad72..ea77330b 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -150,14 +150,8 @@ jobs: uses: gnpaone/dynamic-update-readme@v1.0.2 with: marker_text: "SERVICES_LIST" - table: true markdown_text: | - ${{ steps.service-table.outputs.table }} - - commit_email: noreply@trez.wtf - commit_user: gitea-sonarqube-bot - commit_message: "Update README with services list" deployment-trigger: name: Deployment Trigger From 126baa2a5275979b54e62c753038dad9269622e6 Mon Sep 17 00:00:00 2001 From: markdown-update-bot Date: Sun, 12 Jan 2025 01:06:43 +0000 Subject: [PATCH 26/26] Update readme with dynamic data --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a19fa45a..762e32c1 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,6 +156,5 @@ | zitadel | ghcr.io/zitadel/zitadel:latest | | zitadel-pg-db | postgres:16-alpine | - | -|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| + \ No newline at end of file