Installing-using-Docker-(recommended!).md

@@ -18,13 +18,7 @@ The rest of this page details the manual install process.
 
 ## Prerequisites
 
-Firstly, you need a system running docker. For debian-based systems, this is simple:
-
-`apt-get install docker.io`
-
-`apt-get install docker-compose`
-
-`apt-get install conntrack`
+Firstly, you need a system running docker.Follow the instructions for your distro [here](https://docker-docs.netlify.app/install/#server).
 
 A change needs to be made to the docker config for openbridge to work correctly:
 
@@ -52,7 +46,9 @@ edit /etc/freedmr/freedmr.cfg with your favourite editor:
     TGID_TS2_ACL: DENY:0-79
     GEN_STAT_BRIDGES: True
     ALLOW_NULL_PASSPHRASE: True
-    ANNOUNCEMENT_LANGUAGES: en_GB,en_GB_2,cy_GB,en_US,es_ES,es_ES_2,fr_FR,de_DE,dk_DK,it_IT,no_NO,pl_PL,se_SE,pt_PT,CW
+    ANNOUNCEMENT_LANGUAGES:
+    DATA_GATEWAY: False
+    VALIDATE_SERVER_IDS: True
     SERVER_ID: 0
 
     [REPORTS]
@@ -62,29 +58,35 @@ edit /etc/freedmr/freedmr.cfg with your favourite editor:
     REPORT_CLIENTS: *
 
     [LOGGER]
-    LOG_FILE: freedmr.log
-    LOG_HANDLERS: file-timed
+    LOG_FILE: /dev/null
+    LOG_HANDLERS: console-timed
     LOG_LEVEL: INFO
     LOG_NAME: FreeDMR
 
     [ALIASES]
-    TRY_DOWNLOAD: False
-    PATH: ./
+    TRY_DOWNLOAD: True
+    PATH: ./json/
     PEER_FILE: peer_ids.json
     SUBSCRIBER_FILE: subscriber_ids.json
     TGID_FILE: talkgroup_ids.json
     PEER_URL: https://www.radioid.net/static/rptrs.json
     SUBSCRIBER_URL: https://www.radioid.net/static/users.json
-    STALE_DAYS: 7
-
-    [MYSQL]
-    USE_MYSQL: False
-    USER: hblink
-    PASS: mypassword
-    DB: hblink
-    SERVER: 127.0.0.1
-    PORT: 3306
-    TABLE: repeaters
+    TGID_URL: http://downloads.freedmr.uk/downloads/talkgroup_ids.json
+    LOCAL_SUBSCRIBER_FILE: local_subscriber_ids.json
+    STALE_DAYS: 1
+    SUB_MAP_FILE: sub_map.pkl
+    SERVER_ID_URL: http://downloads.freedmr.uk/downloads/FreeDMR_Hosts.csv
+    SERVER_ID_FILE: server_ids.tsv
+    TOPO_FILE: topography.json
+
+    #Control server shared allstar instance via dial / AMI
+    [ALLSTAR]
+    ENABLED: True
+    USER:admin
+    PASS: password
+    SERVER: asl.example.com
+    PORT: 5038
+    NODE: 11111
     
     [OBP-TEST]
     MODE: OPENBRIDGE
@@ -125,6 +127,9 @@ edit /etc/freedmr/freedmr.cfg with your favourite editor:
     DEFAULT_REFLECTOR: 0
     ANNOUNCEMENT_LANGUAGE: en_GB_2
     GENERATOR: 100
+    ALLOW_UNREG_ID: False
+    PROXY_CONTROL: True
+    OVERRIDE_IDENT_TG:
     
     [ECHO]
     MODE: PEER
@@ -181,19 +186,40 @@ edit /etc/freedmr/freedmr.cfg with your favourite editor:
 
 ## create /etc/freedmr/docker-compose.yml with the following content
 
-    version: '3.3'
+    version: '2.4'
     services:
         freedmr:
             container_name: freedmr
+            cpu_shares: 1024
+            mem_reservation: 600m
             volumes:
                 - '/etc/freedmr/freedmr.cfg:/opt/freedmr/freedmr.cfg'
-                - '/var/log/freedmr/freedmr.log:/opt/freedmr/freedmr.log'
                 - '/etc/freedmr/rules.py:/opt/freedmr/rules.py'
+                #Write JSON files outside of container
+                - '/etc/freedmr/json/:/opt/freedmr/json/'
+
             ports:
                 - '62031:62031/udp'
-                - '62045-62049:62045-62049/udp'
-                - '4321:4321/tcp'
-            image: 'hacknix/freedmr:latest'
+                #Change the below to inlude ports used for your OBP(s)
+                #- '62041:62041/udp'
+            image: 'gitlab.hacknix.net:5050/hacknix/freedmr:development-latest'
+            restart: "unless-stopped"
+            networks:
+               app_net:
+                 ipv4_address: 172.16.238.10
+            #Control parameters inside container
+            environment:
+                #IPV6 support 
+                - FDPROXY_IPV6=0
+                #Display connection stats in log
+                - FDPROXY_STATS=1
+                #Display conneting client info in log
+                - FDPROXY_CLIENTINFO=1
+                #Debug HBP session in log (lots of data!!)
+                - FDPROXY_DEBUG=0
+                #Override proxy external port
+                #- FDPROXY_LISTENPORT=62031
+            read_only: "true"
 
 
 #Run Freedmr