Update Docker image for pluralflux service

.gitea/workflows/build-dev.yml

@@ -1,46 +0,0 @@
-name: Build Dev instance
-
-on:
-  push:
-    branches: ["develop", "Develop"]
-  pull_request:
-    branches: ["develop", "Develop"]
-
-jobs:
-
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up Docker BuildX
-        uses: docker/setup-buildx-action@v3
-
-      - name: login to gitea registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ gitea.server_url }}
-          username: ${{ gitea.actor }}
-          password: ${{ secrets.GITEA }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: |
-            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 ${{ secrets.BOT_DIRECTORY }}
-            docker compose up -d pluralflux-dev

.gitea/workflows/build-main.yml

@@ -1,46 +0,0 @@
-name: nodeJS remote worker
-
-on:
-  push:
-    branches: ["main"]
-  pull_request:
-    branches: ["main"]
-
-jobs: 
-
-  build: 
-    
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        
-      - name: Set up Docker BuildX
-        uses: docker/setup-buildx-action@v3
-
-      - name: login to gitea registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ gitea.server_url }}
-          username: ${{ gitea.actor }}
-          password: ${{ secrets.GITEA }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with: 
-          context: .
-          push: true
-          tags: |
-            engineering.sanya.gay/pluralflux/pluralflux: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 ${{ secrets.BOT_DIRECTORY }}
-            docker compose up -d pluralflux-prod

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

@@ -1,26 +0,0 @@
-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,34 +1,18 @@
 services:
-  pluralflux-dev:
-    image: engineering.sanya.gay/pluralflux/pluralflux-dev:latest
-    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
+  main:
+    image: engineering.sanya.gay/pluralflux/pluralflux
+    container_name: pluralflux
     restart: unless-stopped
     networks:
       - pluralflux-net
-    env_file: "variables-prod.env"
-  postgres-dev:
+    env_file: "variables.env"
+  postgres:
     image: postgres:latest
-    container_name: pluralflux-dev-postgres
+    container_name: pluralflux-postgres
     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
-      - ./pgBackup/prod/:/mnt/pgBackup/prod
+      - ./pgBackup:/mnt/pgBackup
     networks:
       - pluralflux-net
   pgadmin:
@@ -38,22 +22,17 @@ services:
       - "5050:80"
     env_file: "variables.env"
     depends_on:
-      - postgres-dev
-      - postgres-prod
+      - postgres
     networks:
       - pluralflux-net
-      - pluralflux-dev-net
     volumes:
       - pgadmindata:/var/lib/pgadmin
-      - ./pgBackup:/mnt/host
+      #- ./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:
+  pgadmindata:

secrets.env

@@ -1,6 +0,0 @@
-FLUXER_BOT_TOKEN=<your bot token here>
-POSTGRES_PASSWORD=<your postgres password here>
-PGADMIN_DEFAULT_EMAIL: <default postgres admin login>
-PGADMIN_DEFAULT_PASSWORD: <your postgres password here>
-PGADMIN_CONFIG_SERVER_MODE: 'False'
-PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED: 'False'