Merge main into hardening-fixes

.devcontainer/Dockerfile

@@ -18,7 +18,7 @@
 # It reduces the chance of system hijacking and operates with all modern security protocols in place as is
 # expected from a security appliance.
 #
-# This file can be built with `docker compose -f docker-compose.yml up --build --force-recreate`
+# This file can be built with `docker-compose -f docker-compose.yml up --build --force-recreate`
 
 FROM alpine:3.22 AS builder
 

Dockerfile

@@ -15,7 +15,7 @@
 # It reduces the chance of system hijacking and operates with all modern security protocols in place as is
 # expected from a security appliance.
 #
-# This file can be built with `docker compose -f docker-compose.yml up --build --force-recreate`
+# This file can be built with `docker-compose -f docker-compose.yml up --build --force-recreate`
 
 FROM alpine:3.22 AS builder
 

docker-compose.yml

@@ -15,13 +15,13 @@ services:
       - NET_BIND_SERVICE                        # Required to bind to privileged ports (nbtscan)
 
     volumes:
-      - type: volume
-        source: netalertx_config
+      - type: bind
+        source: ${APP_DATA_LOCATION}/netalertx/config
         target: /app/config
         read_only: false
 
-      - type: volume
-        source: netalertx_db
+      - type: bind
+        source: ${APP_DATA_LOCATION}/netalertx/db
         target: /app/db
         read_only: false
 
@@ -30,15 +30,26 @@ services:
         target: /etc/localtime
         read_only: true
 
+      # Retain logs - comment out tmpfs /app/log if you want to retain logs between container restarts
+      # - /path/on/host/log:/app/log
+      # Optional logs
+      # - type: bind
+      #   source: ${LOGS_LOCATION}
+      #   target: /app/log
+      #   read_only: false
+
+      # Optional development mounts
+      - type: bind
+        source: ${DEV_LOCATION}
+        target: /app/front/plugins/custom
+        read_only: false
+
       # Use a custom Enterprise-configured nginx config for ldap or other settings
       # - /custom-enterprise.conf:/services/config/nginx/conf.active/netalertx.conf:ro
 
       # Test your plugin on the production container
       # - /path/on/host:/app/front/plugins/custom
 
-      # Retain logs - comment out tmpfs /app/log if you want to retain logs between container restarts
-      # - /path/on/host/log:/app/log
-
     # Tempfs mounts for writable directories in a read-only container and improve system performance
     tmpfs:
       # Speed up logging. This can be commented out to retain logs between container restarts
@@ -52,11 +63,13 @@ services:
       # /tmp is required by php for session save this should be reworked to /services/run/tmp
       - "/tmp:uid=20211,gid=20211,mode=1700,rw,noexec,nosuid,nodev,async,noatime,nodiratime"
     environment:
-      LISTEN_ADDR: 0.0.0.0                      # Listen for connections on all interfaces
-      PORT: 20211                               # Application port
-      GRAPHQL_PORT: 20212                       # GraphQL API port
-      ALWAYS_FRESH_INSTALL: false               # Set to true to reset your config and database on each container start
-      NETALERTX_DEBUG: 0                        # 0=kill all services and restart if any dies. 1 keeps running dead services.
+      LISTEN_ADDR: 0.0.0.0                          # Listen for connections on all interfaces
+      PORT: ${PORT}                                 # Application port
+      ALWAYS_FRESH_INSTALL: ${ALWAYS_FRESH_INSTALL} # Set to true to reset your config and database on each container start
+      NETALERTX_DEBUG: 0                            # 0=kill all services and restart if any dies. 1 keeps running dead services.
+      TZ: ${TZ}                                     # Timezone, e.g. Europe/Paris
+      # APP_CONF_OVERRIDE={"SCAN_SUBNETS":"['192.168.1.0/24 --interface=eth1']","GRAPHQL_PORT":"20223","UI_theme":"Light"} # (optional) app.conf settings override
+      # LOADED_PLUGINS=["DHCPLSS","PIHOLE","ASUSWRT","FREEBOX"] # (optional) default plugins to load
 
     # Resource limits to prevent resource exhaustion
     mem_limit: 2048m            # Maximum memory usage
@@ -72,7 +85,7 @@ services:
     # Always restart the container unless explicitly stopped
     restart: unless-stopped
 
-volumes:
-  netalertx_config:
-  netalertx_db:
+# volumes:
+#   netalertx_config:
+#   netalertx_db: