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: