From a41925b2a476c0aa0fbb55e691e746cc2bf54fd9 Mon Sep 17 00:00:00 2001
From: Simon <simon@gb7fr.org.uk>
Date: Sat, 17 Sep 2022 01:05:22 +0100
Subject: [PATCH] Use OA4 dash in Docker

---
 docker-configs/docker-compose.yml        | 34 +++++++++-------------
 docker-configs/docker-compose_install.sh | 36 +++++++++---------------
 2 files changed, 27 insertions(+), 43 deletions(-)

diff --git a/docker-configs/docker-compose.yml b/docker-configs/docker-compose.yml
index 6da1a22..127266b 100644
--- a/docker-configs/docker-compose.yml
+++ b/docker-configs/docker-compose.yml
@@ -51,45 +51,37 @@ services:
             #- FDPROXY_LISTENPORT=62031
         read_only: "true"
 
-    freedmrmon:
-        container_name: freedmrmon
+   freedmrmonitor2:
+        container_name: freedmrmonitor2
         cpu_shares: 512
         depends_on:
             - freedmr
-        volumes:
-            #This should be kept to a manageable size from
-            #cron or logrotate outisde of the container.
-            - '/var/log/FreeDMRmonitor/:/opt/FreeDMRmonitor/log/'
-            #Write JSON files outside of container
-            - '/etc/freedmr/json/:/opt/FreeDMRmonitor/json/'
-
-        #Override config file
-        #    - '/etc/freedmr/config.py:/opt/FreeDMRmonitor/config.py'
         ports:
             - '9000:9000/tcp'
-        image: 'hacknix/freedmrmonitor:latest'
+        image: 'gitlab.hacknix.net:5050/freedmr/freedmrmonitor2/freedmrmonitor2:monitor-development-latest'
         restart: "unless-stopped"
         networks:
            app_net:
              ipv4_address: 172.16.238.20
-     
+        read_only: "true"
+        logging:
+              driver: json-file
+
+
     freedmrmonpache:
         container_name: freedmrmonapache
         cpu_shares: 512
         depends_on:
-             - freedmrmon
-        #Use to override html files
-        #And images
-        #volumes:
-        #    - '/var/www/html/:/var/www/html/'
-        #    - '/var/www/html/images/:/var/www/html/images/'
+             - freedmrmonitor2
         ports:
-            - '80:80/tcp'
-        image: hacknix/freedmrmonitor-apache:latest
+            - '8080:80/tcp'
+        image: 'gitlab.hacknix.net:5050/freedmr/freedmrmonitor2/freedmrmonitor2:apache-development-latest'
         restart: "unless-stopped"
         networks:
            app_net:
              ipv4_address: 172.16.238.30
+        logging:
+              driver: json-file
 
 networks:
   app_net:
diff --git a/docker-configs/docker-compose_install.sh b/docker-configs/docker-compose_install.sh
index 23babc9..9f95aea 100644
--- a/docker-configs/docker-compose_install.sh
+++ b/docker-configs/docker-compose_install.sh
@@ -37,7 +37,15 @@ echo Install Docker Compose...
 apt-get -y install docker-compose &&
 
 echo Set userland-proxy to false...
-echo '{ "userland-proxy": false}' > /etc/docker/daemon.json &&
+cat <<EOF > /etc/docker/daemon.json &&
+{ "userland-proxy": false
+    "log-driver": "json-file",
+    "log-opts": {
+        "max-size": "10m",
+        "max-file": "3"
+    }
+}
+EOF
 
 echo Restart docker...
 systemctl restart docker &&
@@ -87,13 +95,13 @@ 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
-TGID_URL: http://downloads.freedmr.uk/downloads/talkgroup_ids.json
+PEER_URL: http://freedmr-lh.gb7fr.org.uk/json/peer_ids.json
+SUBSCRIBER_URL: http://freedmr-lh.gb7fr.org.uk/json/subscriber_ids.json
+TGID_URL: http://freedmr-lh.gb7fr.org.uk/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_URL: http://freedmr-lh.gb7fr.org.uk/json/server_ids.tsv
 SERVER_ID_FILE: server_ids.tsv
 TOPO_FILE: topography.json
 
@@ -191,26 +199,10 @@ echo "BRIDGES = {'9990': [{'SYSTEM': 'ECHO', 'TS': 2, 'TGID': 9990, 'ACTIVE': Tr
 echo Set perms on config directory...
 chown -R 54000 /etc/freedmr &&
 
-echo Setup logging...
-mkdir -p /var/log/freedmr &&
-touch /var/log/freedmr/freedmr.log &&
-chown -R 54000 /var/log/freedmr &&
-mkdir -p /var/log/FreeDMRmonitor &&
-touch /var/log/FreeDMRmonitor/lastheard.log &&
-touch /var/log/FreeDMRmonitor/hbmon.log &&
-chown -R 54001 /var/log/FreeDMRmonitor &&
-
 echo Get docker-compose.yml...
 cd /etc/freedmr &&
 curl https://gitlab.hacknix.net/hacknix/FreeDMR/-/raw/master/docker-configs/docker-compose.yml -o docker-compose.yml &&
-echo Install crontab...
-cat << EOF > /etc/cron.daily/lastheard &&
-#!/bin/bash
-mv /var/log/FreeDMRmonitor/lastheard.log /var/log/FreeDMRmonitor/lastheard.log.save
-/usr/bin/tail -150 /var/log/FreeDMRmonitor/lastheard.log.save > /var/log/FreeDMRmonitor/lastheard.log
-mv /var/log/FreeDMRmonitor/lastheard.log /var/log/FreeDMRmonitor/lastheard.log.save
-/usr/bin/tail -150 /var/log/FreeDMRmonitor/lastheard.log.save > /var/log/FreeDMRmonitor/lastheard.log
-EOF
+
 chmod 755 /etc/cron.daily/lastheard
 
 echo Tune network stack...