Update Docker image for pluralflux service

.gitea/workflows/build-dev.yml

@@ -1,45 +0,0 @@
-name: nodeJS remote worker
-
-on:
-  push:
-    branches: ["develop"]
-  pull_request:
-    branches: ["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:latest
-
-      - name: Deploy bot
-        uses: appleboy/ssh-action@v1.0.3
-        with:
-          host: ${{ secrets.SSH_HOST }}
-          username: ${{ secrets.SSH_USER }}
-          port: 22
-          script: |
-            cd /root/pluralflux-dev/PluralFlux
-            docker compose up -d

.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 /root/pluralflux-prod/PluralFlux
-            docker compose up -d

compose.yaml

@@ -1,19 +1,18 @@
 services:
   main:
-    image: engineering.sanya.gay/pluralflux/pluralflux-dev
+    image: engineering.sanya.gay/pluralflux/pluralflux
     container_name: pluralflux
     restart: unless-stopped
     networks:
       - pluralflux-net
-    env_file: "secrets.env"
+    env_file: "variables.env"
   postgres:
     image: postgres:latest
     container_name: pluralflux-postgres
-    env_file: "secrets.env"
+    env_file: "variables.env"
     volumes:
       - pgdata:/var/lib/postgresql
-    ports:
+      - ./pgBackup:/mnt/pgBackup
-      - "5432:5432"
     networks:
       - pluralflux-net
   pgadmin:
@@ -21,15 +20,19 @@ services:
     container_name: pluralflux-pgadmin
     ports:
       - "5050:80"
-    env_file: "secrets.env"
+    env_file: "variables.env"
     depends_on:
       - postgres
     networks:
       - pluralflux-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
 
 volumes:
   pgdata:
-  secrets:
+  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'