From 260c6a8aa59919e151582200438c32ff3e220939 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 15 Jan 2025 10:53:27 -0500 Subject: [PATCH 01/16] Adding Mastodon container. --- docker-compose.yml | 52 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 75f67d57..4159c33b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3067,6 +3067,58 @@ services: type: bind bind: create_host_path: true + mastodon: + container_name: mastodon + environment: + PUID: ${PUID} + PGID: ${PGID} + TZ: ${TZ} + LOCAL_DOMAIN: trez.wtf + REDIS_HOST: redis + REDIS_PORT: 6379 + DB_HOST: mastodon-pg-db + DB_USER: mastodon + DB_NAME: mastodon + DB_PASS: ${MASTODON_PG_DB_PASSWORD} + DB_PORT: 5432 + ES_ENABLED: false + ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY: + ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY: + ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT: + SECRET_KEY_BASE: + OTP_SECRET: + VAPID_PRIVATE_KEY: + VAPID_PUBLIC_KEY: + SMTP_SERVER: postal-smtp + SMTP_PORT: 25 + SMTP_LOGIN: ${POSTAL_SMTP_AUTH_USER} + SMTP_PASSWORD: ${POSTAL_SMTP_AUTH_PASSWORD} + SMTP_FROM_ADDRESS: noreply@trez.wtf + S3_ENABLED: true + S3_BUCKET: mastodon + AWS_ACCESS_KEY_ID: ${MASTODON_MINIO_ACCESS_KEY} + AWS_SECRET_ACCESS_KEY: ${MASTODON_MINIO_SECRET_KEY} + image: lscr.io/linuxserver/mastodon:latest + labels: + swag: enable + swag_proto: http + swag_port: 5678 + swag_url: mastodon.${MY_TLD} + swag.uptime-kuma.enabled: true + swag.uptime-kuma.monitor.url: https://mastodon.${MY_TLD} + homepage.group: Social + homepage.name: Mastodon + homepage.href: https://mastodon.${MY_TLD} + homepage.icon: mastodon.svg + homepage.description: Open-source social network + homepage.widget.type: mastodon + homepage.widget.url: http://mastodon + ports: + - 9044:80 + - 3444:443 + restart: unless-stopped + volumes: + - ${DOCKER_VOLUME_CONFIG}/mastodon:/config mastodon-pg-db: container_name: mastodon-pg-db environment: From 1c391ceb8b9d2748fa1db859be32fcd091df51b6 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 15 Jan 2025 11:01:58 -0500 Subject: [PATCH 02/16] . --- .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 c8d3d74e..2fd080c3 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -30,7 +30,7 @@ jobs: tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head,state --output csv | egrep '${{ github.ref_name }}' | head -1 | egrep -q 'open' if [ $? -eq 0 ]; then echo "An open PR exists, skipping creation..." - elif [ $? -eq 1 ]; then + elif [ $? -ne 0 ]; then echo "No open PRs, creating one..." tea pr c -r "${{ github.repository }}" -t "Automated PR for ${{ github.ref_name }}" -d "Automated PR for ${{ github.ref_name }}" fi From 60351f5d11bc25a799b24d7d309db7fede6511b3 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 15 Jan 2025 11:17:11 -0500 Subject: [PATCH 03/16] . --- .gitea/workflows/deployment.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 2fd080c3..d2df95de 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -26,12 +26,20 @@ 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 }} tea login default gitea-rinoa - echo "Checking if PR exists for ${{ github.ref_name }}..." - tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head,state --output csv | egrep '${{ github.ref_name }}' | head -1 | egrep -q 'open' + echo "Checking if PR exists for ${{ github.ref_name }}" + tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state + tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head,state --output csv | egrep -q '${{ github.ref_name }}' if [ $? -eq 0 ]; then - echo "An open PR exists, skipping creation..." - elif [ $? -ne 0 ]; then - echo "No open PRs, creating one..." + echo "PR exists, checking state..." + pr_state=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head,state --output csv | egrep '${{ github.ref_name }}' | awk -F',' '{print $4}' | sed -e 's|"||g') + if [ "${pr_state}" != 'open' ]; then + echo "No open PRs exist, creating one now beep boop..." + 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 + elif [ $? -eq 1 ]; 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 }}" fi From 22f37bcdee128b2bbf9d857c6cf46f4ffc5c0b70 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 15 Jan 2025 11:42:45 -0500 Subject: [PATCH 04/16] . --- .gitea/workflows/deployment.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index d2df95de..da169db9 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -27,20 +27,12 @@ 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 }}" - tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state - tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head,state --output csv | egrep -q '${{ github.ref_name }}' + tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep -q '${{ github.ref_name }}' if [ $? -eq 0 ]; then - echo "PR exists, checking state..." - pr_state=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head,state --output csv | egrep '${{ github.ref_name }}' | awk -F',' '{print $4}' | sed -e 's|"||g') - if [ "${pr_state}" != 'open' ]; then - echo "No open PRs exist, creating one now beep boop..." - 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 + echo "PR exists, skipping creation..." elif [ $? -eq 1 ]; 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 }}" + echo "PR does not exist, creating PR..." + tea pr c -r "${{ github.repository }}" -t "Automated PR for ${{ github.ref_name }}" -d "Automated PR for ${{ github.ref_name }}" fi docker-compose-test: From fe66d7a723fedc0e84ed86efbd1317d222cfdbfa Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 15 Jan 2025 11:51:44 -0500 Subject: [PATCH 05/16] . --- .gitea/workflows/deployment.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index da169db9..76d80af0 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -26,13 +26,18 @@ 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 }} tea login default gitea-rinoa - echo "Checking if PR exists for ${{ github.ref_name }}" - tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep -q '${{ github.ref_name }}' - if [ $? -eq 0 ]; then + + echo "Checking if PR exists for branch: ${{ github.ref_name }}" + PR_EXISTS=$(tea pr ls --repo "${{ github.repository }}" --state open --fields index,title,head,state --output csv | grep -c "${{ github.ref_name }}") + + if [ "$PR_EXISTS" -ge 1 ]; then echo "PR exists, skipping creation..." - elif [ $? -eq 1 ]; then + elif [ "$PR_EXISTS" -eq 0 ]; then echo "PR does not exist, creating PR..." tea pr c -r "${{ github.repository }}" -t "Automated PR for ${{ github.ref_name }}" -d "Automated PR for ${{ github.ref_name }}" + else + echo "Error determining PR status. Exiting..." + exit 1 fi docker-compose-test: From fb3f0452a2a90a590c4d0076591ca2aaf3545368 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 15 Jan 2025 11:55:17 -0500 Subject: [PATCH 06/16] . --- .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 76d80af0..1d0303b6 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -27,8 +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 }} tea login default gitea-rinoa - echo "Checking if PR exists for branch: ${{ github.ref_name }}" - PR_EXISTS=$(tea pr ls --repo "${{ github.repository }}" --state open --fields index,title,head,state --output csv | grep -c "${{ github.ref_name }}") + echo "Checking if any open PRs exist for branch: ${{ github.ref_name }}" + PR_STATE=$(tea pr ls --repo "${{ github.repository }}" --state all --fields index,title,head,state --output csv | grep "${{ github.ref_name }}") | head -1 | awk -F',' '{print $4}' | tr -d '"' + PR_EXISTS=$(echo "$PR_STATE" | wc -l) if [ "$PR_EXISTS" -ge 1 ]; then echo "PR exists, skipping creation..." From 88380e6991ef6c786083b945d8e72641dccf1234 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 15 Jan 2025 11:56:12 -0500 Subject: [PATCH 07/16] . --- .gitea/workflows/deployment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 1d0303b6..850ac4c0 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -29,6 +29,7 @@ jobs: echo "Checking if any open PRs exist for branch: ${{ github.ref_name }}" PR_STATE=$(tea pr ls --repo "${{ github.repository }}" --state all --fields index,title,head,state --output csv | grep "${{ github.ref_name }}") | head -1 | awk -F',' '{print $4}' | tr -d '"' + echo "PR_STATE: $PR_STATE" PR_EXISTS=$(echo "$PR_STATE" | wc -l) if [ "$PR_EXISTS" -ge 1 ]; then From ef24bb97e51a675d9902e06f6108551550d48d16 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 15 Jan 2025 12:10:52 -0500 Subject: [PATCH 08/16] . --- .gitea/workflows/deployment.yml | 41 ++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 850ac4c0..4527e260 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -20,27 +20,36 @@ 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 PR exists & Create - id: list-prs + + - name: Check opened PR + id: check-opened-pr-step + uses: sogoagain/check-opened-pr-action@v0.1 + + - name: Create PR... + if: steps.check-opened-pr-step.outputs.exists == 'false' 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 + echo "Creating PR for branch: ${{ github.ref_name }}" + pr_index_recent=$(tea pr ls --state all --fields index --output csv | sed -e 's|"||g' | head -2 | tail -1) + pr_index_new=$((pr_index + 1)) + echo "PR index: $pr_index" + tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }} - ${pr_index_new}" --body "Automatically created PR for branch: ${{ github.ref_name }}" - echo "Checking if any open PRs exist for branch: ${{ github.ref_name }}" - PR_STATE=$(tea pr ls --repo "${{ github.repository }}" --state all --fields index,title,head,state --output csv | grep "${{ github.ref_name }}") | head -1 | awk -F',' '{print $4}' | tr -d '"' - echo "PR_STATE: $PR_STATE" - PR_EXISTS=$(echo "$PR_STATE" | wc -l) + # echo "Checking if any open PRs exist for branch: ${{ github.ref_name }}" + # PR_STATE=$(tea pr ls --repo "${{ github.repository }}" --state all --fields index,title,head,state --output csv | grep "${{ github.ref_name }}") | head -1 | awk -F',' '{print $4}' | tr -d '"' + # echo "PR_STATE: $PR_STATE" + # PR_EXISTS=$(echo "$PR_STATE" | wc -l) - if [ "$PR_EXISTS" -ge 1 ]; then - echo "PR exists, skipping creation..." - elif [ "$PR_EXISTS" -eq 0 ]; then - echo "PR does not exist, creating PR..." - tea pr c -r "${{ github.repository }}" -t "Automated PR for ${{ github.ref_name }}" -d "Automated PR for ${{ github.ref_name }}" - else - echo "Error determining PR status. Exiting..." - exit 1 - fi + # if [ "$PR_EXISTS" -ge 1 ]; then + # echo "PR exists, skipping creation..." + # elif [ "$PR_EXISTS" -eq 0 ]; then + # echo "PR does not exist, creating PR..." + # tea pr c -r "${{ github.repository }}" -t "Automated PR for ${{ github.ref_name }}" -d "Automated PR for ${{ github.ref_name }}" + # else + # echo "Error determining PR status. Exiting..." + # exit 1 + # fi docker-compose-test: name: Docker Compose Test From 4e39415f49088d5c91746d8dbcb05b4f75ae75b3 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 15 Jan 2025 12:14:27 -0500 Subject: [PATCH 09/16] . --- .gitea/workflows/deployment.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 4527e260..cfa59b09 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -32,9 +32,9 @@ jobs: tea login default gitea-rinoa echo "Creating PR for branch: ${{ github.ref_name }}" pr_index_recent=$(tea pr ls --state all --fields index --output csv | sed -e 's|"||g' | head -2 | tail -1) - pr_index_new=$((pr_index + 1)) - echo "PR index: $pr_index" - tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }} - ${pr_index_new}" --body "Automatically created PR for branch: ${{ github.ref_name }}" + pr_index_new=$((${pr_index_recent} + 1)) + echo "PR index: ${pr_index_new}" + tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }} - ${pr_index_new}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }} # echo "Checking if any open PRs exist for branch: ${{ github.ref_name }}" # PR_STATE=$(tea pr ls --repo "${{ github.repository }}" --state all --fields index,title,head,state --output csv | grep "${{ github.ref_name }}") | head -1 | awk -F',' '{print $4}' | tr -d '"' From ef36881e15fcc94ec497235c09b55be47b52a2bd Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 15 Jan 2025 12:16:01 -0500 Subject: [PATCH 10/16] . --- .gitea/workflows/deployment.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index cfa59b09..bdf9ec8b 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -31,10 +31,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 "Creating PR for branch: ${{ github.ref_name }}" - pr_index_recent=$(tea pr ls --state all --fields index --output csv | sed -e 's|"||g' | head -2 | tail -1) - pr_index_new=$((${pr_index_recent} + 1)) - echo "PR index: ${pr_index_new}" - tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }} - ${pr_index_new}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }} + tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }} # echo "Checking if any open PRs exist for branch: ${{ github.ref_name }}" # PR_STATE=$(tea pr ls --repo "${{ github.repository }}" --state all --fields index,title,head,state --output csv | grep "${{ github.ref_name }}") | head -1 | awk -F',' '{print $4}' | tr -d '"' From 7d7e29112770f107a2df2053c434800f4a083a1e Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 15 Jan 2025 12:21:31 -0500 Subject: [PATCH 11/16] .... --- .gitea/workflows/deployment.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index bdf9ec8b..e06e5ce8 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -21,12 +21,16 @@ jobs: name: 'tea' version: '0.9.2' - - name: Check opened PR + - name: Check if open PR exists id: check-opened-pr-step - uses: sogoagain/check-opened-pr-action@v0.1 - - - name: Create PR... - if: steps.check-opened-pr-step.outputs.exists == 'false' + 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_exists=$(tea pr list --state open --head ${{ github.ref_name }} --repo ${{ github.repository }} | wc -l) + echo "exists=$pr_exists" >> $GITHUB_OUTPUT + + - name: Create PR + if: steps.check-opened-pr-step.outputs.exists == 0 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 From fe0d4f5035c3380276d9899bbff9b1979805e07e Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 15 Jan 2025 12:23:17 -0500 Subject: [PATCH 12/16] .... --- .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 e06e5ce8..09cf9864 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -26,7 +26,7 @@ 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 }} tea login default gitea-rinoa - pr_exists=$(tea pr list --state open --head ${{ github.ref_name }} --repo ${{ github.repository }} | wc -l) + pr_exists=$(tea pr list repo ${{ github.repository }} --state open --head ${{ github.ref_name }} | wc -l) echo "exists=$pr_exists" >> $GITHUB_OUTPUT - name: Create PR From a76e7e53da598fcfe88d4d3dc95a68b30dcbd147 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 15 Jan 2025 12:24:16 -0500 Subject: [PATCH 13/16] .... --- .gitea/workflows/deployment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 09cf9864..571c9d10 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -26,6 +26,7 @@ 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 }} tea login default gitea-rinoa + tea pr list repo ${{ github.repository }} --state open --head ${{ github.ref_name }} | wc -l pr_exists=$(tea pr list repo ${{ github.repository }} --state open --head ${{ github.ref_name }} | wc -l) echo "exists=$pr_exists" >> $GITHUB_OUTPUT From 2642a9897e1d2a0ba7dca59bf3463ea53ed85e81 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 15 Jan 2025 12:25:44 -0500 Subject: [PATCH 14/16] .... --- .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 571c9d10..8c660bad 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -26,8 +26,7 @@ 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 }} tea login default gitea-rinoa - tea pr list repo ${{ github.repository }} --state open --head ${{ github.ref_name }} | wc -l - pr_exists=$(tea pr list repo ${{ github.repository }} --state open --head ${{ github.ref_name }} | wc -l) + pr_exists=$(tea pr list --repo ${{ github.repository }} --state open --head ${{ github.ref_name }} | wc -l) echo "exists=$pr_exists" >> $GITHUB_OUTPUT - name: Create PR From 6ca7560eb7c5805e1abb9a4a3fe8ef39a1327103 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 15 Jan 2025 12:33:12 -0500 Subject: [PATCH 15/16] .... --- .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 8c660bad..5fa60c59 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -26,7 +26,7 @@ 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 }} tea login default gitea-rinoa - pr_exists=$(tea pr list --repo ${{ github.repository }} --state open --head ${{ github.ref_name }} | wc -l) + pr_exists=$(tea pr list --repo ${{ github.repository }} --state open | egrep ${{ github.ref_name }} | wc -l) echo "exists=$pr_exists" >> $GITHUB_OUTPUT - name: Create PR From 592e88f14752056046bec7258ffdf7abb9d696f4 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 15 Jan 2025 17:36:17 +0000 Subject: [PATCH 16/16] chore: Update README --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cb1e9cf3..778cd567 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ | fastenhealth | ghcr.io/fastenhealth/fasten-onprem:main | | flaresolverr | ghcr.io/flaresolverr/flaresolverr:latest | | ghost | ghost:latest | -| gitea | gitea/gitea:1.22.6 | +| gitea | gitea/gitea:1.23.1 | | gitea-db | postgres:14 | | gitea-opengist | ghcr.io/thomiceli/opengist:latest | | gitea-runner | gitea/act_runner:latest | @@ -77,7 +77,8 @@ | lldap | lldap/lldap:stable | | localai | localai/localai:latest-aio-cpu | | maloja | krateng/maloja:latest | -| mariadb | ghcr.io/linuxserver/mariadb | +| mariadb | linuxserver/mariadb | +| mastodon | lscr.io/linuxserver/mastodon:latest | | mastodon-pg-db | postgres:17-alpine | | minio | minio/minio | | mongodb | mongo:7.0 |