3.1

.github/workflows/deploy.yml

@@ -1,8 +1,9 @@
 name: BUG Deploy
 env:
-    regsitry: "ghcr.io"
+    registry: "ghcr.io"
 
 on:
+    workflow_dispatch:
     push:
         branches:
             - main
@@ -20,7 +21,7 @@ jobs:
             packages: write
         defaults:
             run:
-                working-directory: ./src
+                working-directory: ./src/server
         steps:
             # get the latest version of the repository
             - name: Checkout
@@ -38,12 +39,13 @@ jobs:
               name: Get Backend Version
               id: backend-version
               with:
-                  path: ./src
+                  path: ./
             - uses: martinbeentjes/npm-get-version-action@master
               name: Get Frontend Version
               id: frontend-version
               with:
                   path: ./src/client
+
             - name: Print Current Versions
               run: echo Building BUG with backend version ${{ steps.backend-version.outputs.current-version }} and frontend version ${{ steps.frontend-version.outputs.current-version }}
 
@@ -62,7 +64,7 @@ jobs:
             - name: Login to GHCR Registry
               uses: docker/login-action@v3
               with:
-                  registry: ${{ env.regsitry }}
+                  registry: ${{ env.registry }}
                   username: ${{ github.actor }}
                   password: ${{ secrets.GITHUB_TOKEN }}
                   logout: false
@@ -71,12 +73,13 @@ jobs:
             - name: Build and push to registry
               uses: docker/build-push-action@v6
               with:
-                  context: "./src"
-                  platforms: linux/amd64,linux/arm64
+                  context: "."
+                  file: ./src/server/Dockerfile
+                  platforms: linux/amd64
                   push: ${{ github.event_name != 'pull_request' }}
                   tags: |
-                      ${{env.regsitry}}/${{ github.repository_owner }}/bug:latest
-                      ${{env.regsitry}}/${{ github.repository_owner }}/bug:${{steps.backend-version.outputs.current-version}}
+                      ${{env.registry}}/${{ github.repository_owner }}/bug:latest
+                      ${{env.registry}}/${{ github.repository_owner }}/bug:${{steps.backend-version.outputs.current-version}}
                   outputs: type=registry
                   labels: |
                       author=${{github.actor}}

.gitignore

@@ -3,24 +3,25 @@
 node_modules
 
 #Logs
-/src/logs/*
-!/src/logs/.gitkeep
+/logs/*
+!/logs/.gitkeep
 
 #Backup Data
-/src/data/*
-!/src/data/.gitkeep
+/src/server/data/*
+!/src/server/data/.gitkeep
 
 # Panel Configs
-/src/config/panels/*.json
-!/src/config/panels/.gitkeep
+/src/server/config/panels/*.json
+!/src/server/config/panels/.gitkeep
 
 # Global Config
-/src/config/global/*.json
-!/src/config/global/.gitkeep
+/src/server/config/global/*.json
+!/src/server/config/global/.gitkeep
 
 # Module Dockerfiles
 Dockerfile*
-!/src/Dockerfile
+!/src/server/Dockerfile
+!/src/server/services/dockerfile-write.js
 
 # Global Environment Files
 .env.development
@@ -29,14 +30,16 @@ Dockerfile*
 
 # Client
 src/client/.pnp
+src/client/dist/*
 .pnp.js
 
 # Testing
 src/client/coverage
-src/routes/logs
+src/server/routes/logs
 
 # Client Production Build
 /src/client/build/*
+/src/client/dist/*
 !/src/client/build/.gitkeep
 
 # Storybook Static Files
@@ -48,3 +51,5 @@ docs/assets/storybook
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+TODO.md

docker-compose.yml

@@ -6,12 +6,15 @@ networks:
 services:
     app:
         container_name: bug
-        build: "./src"
+        build:
+            context: .
+            dockerfile: ./src/server/Dockerfile
         restart: unless-stopped
         user: root
         volumes:
             - /var/run/docker.sock:/var/run/docker.sock
-            - ./src:/home/node/bug
+            - .:/home/node/bug
+            - /home/node/bug/node_modules
         environment:
             MODULE_PORT: 3200
             MODULE_HOME: /home/node/module
@@ -26,17 +29,18 @@ services:
             BUG_LOG_FOLDER: logs
             BUG_LOG_NAME: bug
             BUG_REGISTRY_FQDN: ghcr.io/bbc
-            BUG_UPDATE_CHECK: "false"
             PORT: 3000
             NODE_ENV: development
             SESSION_SECRET: aSecretForYourSessions
+        working_dir: /home/node/bug
         depends_on:
             - mongo
         networks:
             - bug
         ports:
             - 3000:3000
             - 3101:3101
+        command: npm run dev
         logging:
             driver: "json-file"
             options:
@@ -56,45 +60,3 @@ services:
             options:
                 max-size: "10m"
                 max-file: "1"
-
-    watchtower:
-        container_name: bug-watchtower
-        image: containrrr/watchtower
-        restart: unless-stopped
-        volumes:
-            - /var/run/docker.sock:/var/run/docker.sock
-        networks:
-            - bug
-        ports:
-            - 8080:8080
-        logging:
-            driver: "json-file"
-            options:
-                max-size: "10m"
-                max-file: "1"
-        environment:
-            WATCHTOWER_DEBUG: "true"
-            WATCHTOWER_HTTP_API_UPDATE: "true"
-            WATCHTOWER_HTTP_API_TOKEN: bugupdatetoken
-            WATCHTOWER_LABEL_ENABLE: "true"
-    mongo-web:
-        image: mongo-express
-        container_name: bug-mongo-express
-        restart: unless-stopped
-        ports:
-            - 3202:8081
-        logging:
-            driver: "json-file"
-            options:
-                max-size: "10m"
-                max-file: "1"
-        environment:
-            ME_CONFIG_OPTIONS_EDITORTHEME: "ambiance"
-            ME_CONFIG_MONGODB_SERVER: "bug-mongo"
-            ME_CONFIG_BASICAUTH_USERNAME: admin
-            ME_CONFIG_BASICAUTH_PASSWORD: bugdev
-        hostname: mongo-web
-        networks:
-            - bug
-        depends_on:
-            - mongo