From 636fedba96b8f1f83f1dc126bc17210767ada6e9 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 17 Jan 2025 14:34:06 -0500 Subject: [PATCH 1/7] Testing out Rundeck. --- docker-compose.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 81eedd1a..3032755b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3954,6 +3954,13 @@ services: security_opt: - no-new-privileges=true user: nobody + rundeck: + container_name: rundeck + image: rundeck/rundeck:5.8.0 + ports: + - 4440:4440 + volumes: + - rundeck-data:/home/rundeck/server/data sabnzbdvpn: cap_add: - NET_ADMIN @@ -7110,6 +7117,8 @@ volumes: name: plausible-event-logs reactive-resume-pg: name: reactive-resume-pg + rundeck-data: + name: rundeck-data semaphore_config: name: semaphore_config semaphore_data: From 689105fd5acaf906e326e70519614b93b468c2de Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 17 Jan 2025 14:38:20 -0500 Subject: [PATCH 2/7] . --- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index 9c1e0843..bab8628f 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -5,7 +5,7 @@ on: branches-ignore: - main paths: - - './docker-compose.yml' + - '**/docker-compose.yml' jobs: check-and-create-pr: @@ -21,7 +21,7 @@ jobs: uri: 'https://gitea.com/gitea/tea/releases/download/v0.9.2/tea-0.9.2-linux-amd64' name: 'tea' version: '0.9.2' - + - name: Check if open PR exists id: check-opened-pr-step continue-on-error: true From 034d3f58f52ea422a80d87c35cd0ec4e44f56f6c Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 17 Jan 2025 14:38:46 -0500 Subject: [PATCH 3/7] . --- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index bab8628f..9bf788a8 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -5,7 +5,7 @@ on: branches-ignore: - main paths: - - '**/docker-compose.yml' + - '**.yml' jobs: check-and-create-pr: From 1a46c61546a0e72d8bb7ef403eec6f506700f3b5 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 17 Jan 2025 19:41:59 +0000 Subject: [PATCH 4/7] chore: Update README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index d34b6770..2154752b 100644 --- a/README.md +++ b/README.md @@ -101,6 +101,7 @@ | readarr | lscr.io/linuxserver/readarr:develop | | redis | redis:alpine | | redlib | quay.io/redlib/redlib:latest | +| rundeck | rundeck/rundeck:5.8.0 | | sabnzbdvpn | ghcr.io/binhex/arch-sabnzbdvpn:latest | | scraperr | jpyles0524/scraperr:latest | | scraperr-api | jpyles0524/scraperr_api:latest | From 11d629c1c0b2cbbcddad92523229c202eac3ee9d Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 17 Jan 2025 14:49:33 -0500 Subject: [PATCH 5/7] Adding labels for Rundeck. --- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 13 +++++++------ docker-compose.yml | 11 +++++++++++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index 9bf788a8..86bc5f14 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -51,7 +51,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - + - name: Install jq uses: dcarbone/install-jq-action@v3.0.1 @@ -88,7 +88,7 @@ jobs: - name: Install yq uses: dcarbone/install-yq-action@v1 - + - name: Install flarectl uses: supplypike/setup-bin@v4 with: @@ -106,7 +106,7 @@ jobs: yq '.services[].labels.swag_url' docker-compose.yml | egrep -v 'null' | sed -e 's|"||g' | awk -F'.' '{print $1}' | sort > compose_subdomains.txt echo "Grabbing subdomains from Cloudflare..." flarectl --json dns list --zone "trez.wtf" --type=CNAME --content "trez.wtf" | jq '.[].Name' | sed -e 's|"||g' | awk -F"." '{print $1}' | sort > cloudflare_subdomains.txt - + - name: Compare Subdomains id: compare-subdomains uses: LouisBrunner/diff-action@v2.2.0 @@ -141,7 +141,7 @@ jobs: - name: Install yq uses: dcarbone/install-yq-action@v1 - + - name: Generate service list run: | yq '.services | to_entries | map({"service": .key, "image": .value.image})' docker-compose.yml > services.yml @@ -172,7 +172,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - + - name: Install tea uses: supplypike/setup-bin@v4 with: @@ -186,6 +186,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 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') + echo "${pr_index}" 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} docker-compose-deploy: @@ -211,7 +212,7 @@ jobs: - name: Docker Compose Deployment uses: keatonLiu/docker-compose-remote-action@v1.2 - with: + with: ssh_user: gitea-deploy ssh_host: 192.168.1.254 ssh_host_public_key: ${{ secrets.RINOA_GITEA_PUBLIC_SSH_KEY }} diff --git a/docker-compose.yml b/docker-compose.yml index 3032755b..0985675b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3957,6 +3957,17 @@ services: rundeck: container_name: rundeck image: rundeck/rundeck:5.8.0 + labels: + homepage.group: Code/DevOps + homepage.name: Rundeck + homepage.icon: rundeck.svg + homepage.description: Open-source automation service with a web console, command line tools, and web API + swag: enable + swag_proto: http + swag_port: 4440 + swag_url: rundeck.${MY_TLD} + swag.uptime-kuma.enabled: true + swag.uptime-kuma.monitor.url: https://rundeck.${MY_TLD} ports: - 4440:4440 volumes: From e9ebe526f8abc733a75360c26f5b1570c21afae9 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 17 Jan 2025 14:58:08 -0500 Subject: [PATCH 6/7] . --- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index 86bc5f14..be18c202 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -184,10 +184,11 @@ jobs: 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 }} + "echo Setting default login for Gitea..." 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') + pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ github.ref_name }} | awk -F, '{print $1}' | sed -e 's|"||g') echo "${pr_index}" - 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} + tea pr m --repo ${{ github.repository }} --title "Auto Merge of PR #${pr_index} - ${{ github.ref_name }}" --message "Merged by ${{ github.actor }}" --output table ${pr_index} docker-compose-deploy: name: Deploy via Docker Compose From 24461293d7ee1b94cd09bceba416e00b27981b0d Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 17 Jan 2025 15:03:43 -0500 Subject: [PATCH 7/7] . --- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index be18c202..f1581d11 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -184,7 +184,7 @@ jobs: 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 }} - "echo Setting default login for Gitea..." + echo "Setting default login for Gitea..." tea login default gitea-rinoa pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ github.ref_name }} | awk -F, '{print $1}' | sed -e 's|"||g') echo "${pr_index}"