Compare commits

..

1 Commits

Author SHA1 Message Date
Trez.One 04451c6bde Adding healthcheck for mariadb and updating depends_on.
Gitea Branch PR, SonarQube Analyze, and Merge Workflow / Check and Create PR (push) Has been cancelled
Gitea Branch PR, SonarQube Analyze, and Merge Workflow / Docker Compose Test (push) Has been cancelled
Gitea Branch PR, SonarQube Analyze, and Merge Workflow / Cloudflare DNS Setup (push) Has been cancelled
Gitea Branch PR, SonarQube Analyze, and Merge Workflow / Update README (push) Has been cancelled
Gitea Branch PR, SonarQube Analyze, and Merge Workflow / PR Merge (push) Has been cancelled
Gitea Branch PR, SonarQube Analyze, and Merge Workflow / Deploy via Docker Compose (push) Has been cancelled
2025-01-14 12:08:39 -05:00
2 changed files with 25 additions and 96 deletions
+14 -28
View File
@@ -20,37 +20,22 @@ 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
- name: Check if PR exists & Create
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 }}
tea login default gitea-rinoa
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
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
echo "Creating PR for branch: ${{ github.ref_name }}"
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 '"'
# 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
echo "Checking if PR exists for ${{ github.ref_name }}"
tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state
pr_state=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head,state --output csv | egrep '${{ gitea.ref_name }}' | head -1 |awk -F, '{print $4}' | sed -e 's|"||g')
echo "PR state: ${pr_state}"
if [ "${pr_state}" != 'open' ]; 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 }}"
elif [ "${pr_state}" = 'open' ]; then
echo "PR already exists, skipping creation..."
fi
docker-compose-test:
name: Docker Compose Test
@@ -199,6 +184,7 @@ jobs:
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}
docker-compose-deploy:
name: Deploy via Docker Compose
runs-on: ubuntu-latest
+11 -68
View File
@@ -557,9 +557,8 @@ services:
container_name: castopod
depends_on:
mariadb:
condition: service_started
condition: service_healthy
required: true
restart: true
environment:
MYSQL_DATABASE: castopod
MYSQL_USER: castopod
@@ -1100,7 +1099,7 @@ services:
container_name: ghost_blog
depends_on:
mariadb:
condition: service_started
condition: service_healthy
required: true
restart: true
environment:
@@ -1707,9 +1706,8 @@ services:
container_name: hortusfox
depends_on:
mariadb:
condition: service_started
condition: service_healthy
required: true
restart: true
environment:
APP_ADMIN_EMAIL: charish.patel@trez.wtf
APP_ADMIN_PASSWORD: ${HORTUSFOX_ADMIN_PASSWORD}
@@ -1872,11 +1870,6 @@ services:
create_host_path: true
invoice_ninja:
container_name: invoice_ninja
depends_on:
mariadb:
condition: service_started
required: true
restart: true
environment:
APP_DEBUG: true
APP_KEY: ${IN_APP_KEY}
@@ -3035,6 +3028,11 @@ services:
PUID: 1000
TZ: America/New_York
MYSQL_PASSWORD: VQU23wHKRNmfpAPt5E9BxMaSGJdWjLuz
healthcheck:
test: "/usr/bin/mariadb -u root -p${MARIADB_ENVIRONMENT_MYSQL_ROOT_PASSWORD} -e \"SHOW DATABASES;\""
interval: 30s
timeout: 3s
retries: 5
hostname: Rinoa
image: linuxserver/mariadb
networks:
@@ -3067,58 +3065,6 @@ 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:
@@ -3374,9 +3320,8 @@ services:
container_name: nextcloud
depends_on:
mariadb:
condition: service_started
condition: service_healthy
required: true
restart: true
environment:
PGID: 1000
PUID: 1000
@@ -3491,9 +3436,8 @@ services:
container_name: paperless-ngx
depends_on:
mariadb:
condition: service_started
condition: service_healthy
required: true
restart: true
environment:
PAPERLESS_DBENGINE: mariadb
PAPERLESS_DBHOST: mariadb
@@ -6141,9 +6085,8 @@ services:
container_name: wallabag
depends_on:
mariadb:
condition: service_started
condition: service_healthy
required: true
restart: true
redis:
condition: service_started
required: true