Added workflow_dispatch

This allows one to run the workflow when they want

Signed-off-by: Aster <code@asterfialla.com>

.gitea/workflows/build-dev.yml

@@ -1,10 +1,10 @@
-name: nodeJS remote worker
+name: Build Dev instance
 
 on:
   push:
-    branches: ["develop"]
+    branches: ["develop", "Develop"]
   pull_request:
-    branches: ["develop"]
+    branches: ["develop", "Develop"]
 
 jobs:
 
@@ -32,14 +32,15 @@ jobs:
           context: .
           push: true
           tags: |
-            engineering.sanya.gay/pluralflux/pluralflux:latest
+            engineering.sanya.gay/pluralflux/pluralflux-dev:latest
 
       - name: Deploy bot
         uses: appleboy/ssh-action@v1.0.3
         with:
           host: ${{ secrets.SSH_HOST }}
           username: ${{ secrets.SSH_USER }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
           port: 22
           script: |
-            cd /root/pluralflux-dev/PluralFlux
+            cd ${{ secrets.BOT_DIRECTORY }}
-            docker compose up -d
+            docker compose up -d pluralflux-dev

.gitea/workflows/build-main.yml

@@ -42,5 +42,5 @@ jobs:
           key: ${{ secrets.SSH_PRIVATE_KEY }}
           port: 22
           script: |
-            cd /root/pluralflux-prod/PluralFlux
+            cd ${{ secrets.BOT_DIRECTORY }}
-            docker compose up -d
+            docker compose up -d pluralflux-prod

.gitea/workflows/sync-from-mirror.yaml

@@ -0,0 +1,26 @@
+name: Auto-Sync from Mirror
+on:
+  push:
+    repository: "Pluralflux/Pluralflux"
+    branches: [main,develop]
+
+  workflow_dispatch:
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest 
+    steps:
+      - name: Checkout Fork
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.GITEA_TOKEN }}
+
+      - name: Pull from Mirror
+        run: |
+          git remote add upstream https://engineering.sanya.gay/PluralFlux/PluralFlux.git
+          git fetch upstream --prune
+          git reset --hard origin/main
+          git push origin "refs/remotes/upstream/*:refs/heads/*" --force-with-lease
+          git merge upstream/main -m "Syncing from github"
+          git push origin main

compose.yaml

@@ -1,19 +1,34 @@
 services:
-  main:
+  pluralflux-dev:
-    image: engineering.sanya.gay/pluralflux/pluralflux-dev
+    image: engineering.sanya.gay/pluralflux/pluralflux-dev:latest
-    container_name: pluralflux
+    container_name: pluralflux-dev
+    restart: unless-stopped
+    networks:
+      - pluralflux-dev-net
+    env_file: "variables.env"
+  pluralflux-prod:
+    image: engineering.sanya.gay/pluralflux/pluralflux:latest
+    container_name: pluralflux-prod
     restart: unless-stopped
     networks:
       - pluralflux-net
-    env_file: "secrets.env"
+    env_file: "variables-prod.env"
-  postgres:
+  postgres-dev:
     image: postgres:latest
-    container_name: pluralflux-postgres
+    container_name: pluralflux-dev-postgres
-    env_file: "secrets.env"
+    env_file: "variables.env"
+    volumes:
+      - pgdataDev:/var/lib/postgresql
+      - ./pgBackup:/mnt/pgBackup
+    networks:
+      - pluralflux-dev-net
+  postgres-prod:
+    image: postgres:latest
+    container_name: pluralflux-prod-postgres
+    env_file: "variables-prod.env"
     volumes:
       - pgdata:/var/lib/postgresql
-    ports:
+      - ./pgBackup/prod/:/mnt/pgBackup/prod
-      - "5432:5432"
     networks:
       - pluralflux-net
   pgadmin:
@@ -21,15 +36,24 @@ services:
     container_name: pluralflux-pgadmin
     ports:
       - "5050:80"
-    env_file: "secrets.env"
+    env_file: "variables.env"
     depends_on:
-      - postgres
+      - postgres-dev
+      - postgres-prod
     networks:
       - pluralflux-net
-
+      - pluralflux-dev-net
+    volumes:
+      - pgadmindata:/var/lib/pgadmin
+      - ./pgBackup:/mnt/host
+      # uncomment the above line if you plan to restore / backup dump files from PGAdmin UI
 networks:
   pluralflux-net:
+    driver: bridge
+  pluralflux-dev-net:
+    driver: bridge
 
 volumes:
+  pgdataDev:
+  pgadmindata:
   pgdata:
-  secrets: