diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index 9c1e0843..f1581d11 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: @@ -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 @@ -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: @@ -184,9 +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') - 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} + 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} - ${{ github.ref_name }}" --message "Merged by ${{ github.actor }}" --output table ${pr_index} docker-compose-deploy: name: Deploy via Docker Compose @@ -211,7 +213,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/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 | diff --git a/docker-compose.yml b/docker-compose.yml index 81eedd1a..0985675b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3954,6 +3954,24 @@ services: security_opt: - no-new-privileges=true user: nobody + 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: + - rundeck-data:/home/rundeck/server/data sabnzbdvpn: cap_add: - NET_ADMIN @@ -7110,6 +7128,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: