From 048e87d7d4afd709b38c94f29b77a85ef24d3b1e Mon Sep 17 00:00:00 2001
From: Simon <simon@gb7fr.org.uk>
Date: Sun, 11 Sep 2022 00:17:50 +0100
Subject: [PATCH] Update Docker and one-shot install

---
 docker-configs/docker-compose.yml        |  5 +--
 docker-configs/docker-compose_install.sh | 57 +++++++++++++++++-------
 2 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/docker-configs/docker-compose.yml b/docker-configs/docker-compose.yml
index c4c3738..6da1a22 100644
--- a/docker-configs/docker-compose.yml
+++ b/docker-configs/docker-compose.yml
@@ -24,7 +24,6 @@ services:
         mem_reservation: 600m
         volumes:
             - '/etc/freedmr/freedmr.cfg:/opt/freedmr/freedmr.cfg'
-            - '/var/log/freedmr/:/opt/freedmr/log/'
             - '/etc/freedmr/rules.py:/opt/freedmr/rules.py'
             #Write JSON files outside of container
             - '/etc/freedmr/json/:/opt/freedmr/json/'
@@ -32,8 +31,8 @@ services:
         ports:
             - '62031:62031/udp'
             #Change the below to inlude ports used for your OBP(s)
-            - '62041:62041/udp'
-        image: 'hacknix/freedmr:latest'
+            #- '62041:62041/udp'
+        image: 'gitlab.hacknix.net:5050/hacknix/freedmr:development-latest'
         restart: "unless-stopped"
         networks:
            app_net:
diff --git a/docker-configs/docker-compose_install.sh b/docker-configs/docker-compose_install.sh
index f1a2bc1..a434306 100644
--- a/docker-configs/docker-compose_install.sh
+++ b/docker-configs/docker-compose_install.sh
@@ -21,9 +21,29 @@
 echo FreeDMR Docker installer...
 
 echo Installing required packages...
-apt-get -y install docker.io && 
+#apt-get -y install docker.io && 
+#apt-get -y install docker-compose &&
+#apt-get -y  install conntrack &&
+
+echo Install Docker Community Edition...
+apt-get remove docker docker-engine docker.io &&
+apt-get -y update &&
+apt-get install \
+     apt-transport-https \
+     ca-certificates \
+     curl \
+     gnupg2 \
+     software-properties-common &&
+curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add - &&
+add-apt-repository \
+   "deb [arch=amd64] https://download.docker.com/linux/debian \
+   $(lsb_release -cs) \
+   stable" &&
+apt-get -y update &&
+apt-get -y install docker-ce &&
+
+echo Install Docker Compose...
 apt-get -y install docker-compose &&
-apt-get -y  install conntrack &&
 
 echo Set userland-proxy to false...
 echo '{ "userland-proxy": false}' > /etc/docker/daemon.json &&
@@ -54,6 +74,8 @@ GEN_STAT_BRIDGES: True
 ALLOW_NULL_PASSPHRASE: True
 ANNOUNCEMENT_LANGUAGES:
 SERVER_ID: 0
+DATA_GATEWAY: False
+VALIDATE_SERVER_IDS: True
 
 
 [REPORTS]
@@ -63,8 +85,8 @@ REPORT_PORT: 4321
 REPORT_CLIENTS: *
 
 [LOGGER]
-LOG_FILE: log/freedmr.log
-LOG_HANDLERS: file-timed
+LOG_FILE: /dev/null
+LOG_HANDLERS: console-timed
 LOG_LEVEL: INFO
 LOG_NAME: FreeDMR
 
@@ -75,20 +97,24 @@ 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: http://downloads.freedmr.uk/downloads/local_subscriber_ids.json
-TGID_URL: TGID_URL: https://freedmr.cymru/talkgroups/talkgroup_ids_json.php
+SUBSCRIBER_URL: https://www.radioid.net/static/users.json
+TGID_URL: http://downloads.freedmr.uk/downloads/talkgroup_ids.json
+LOCAL_SUBSCRIBER_FILE: local_subscriber_ids.json
 STALE_DAYS: 1
-LOCAL_SUBSCRIBER_FILE: local_subcriber_ids.json
 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
 
-[MYSQL]
-USE_MYSQL: False
-USER: hblink
-PASS: mypassword
-DB: hblink
-SERVER: 127.0.0.1
-PORT: 3306
-TABLE: repeaters
+
+#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
@@ -132,6 +158,7 @@ ANNOUNCEMENT_LANGUAGE: en_GB
 GENERATOR: 100
 ALLOW_UNREG_ID: False
 PROXY_CONTROL: True
+OVERRIDE_IDENT_TG:
 
 [ECHO]
 MODE: PEER