docker-compose.yml

docker-configs/docker-compose.yml

@@ -1,5 +1,4 @@
-###############################################################################
-# Copyright (C) 2020 Simon Adlem, G7RZU <g7rzu@gb7fr.org.uk>  
+###############################################################################  
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -14,24 +13,25 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program; if not, write to the Free Software Foundation,
 #   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+#
 ###############################################################################
 
 version: '2.4'
 services:
-    freedmr:
-        container_name: freedmr
+
+    adn-server:
+        container_name: adn-server
         cpu_shares: 1024
         mem_reservation: 600m
         volumes:
-            - '/etc/freedmr/freedmr.cfg:/opt/freedmr/freedmr.cfg'
-            #Write JSON files outside of container
-            - '/etc/freedmr/json/:/opt/freedmr/json/'
+            - '/etc/ADN-Systems/ADN.cfg:/opt/ADN-DMR-Peer-Server/config/ADN.cfg'
 
         ports:
             - '62031:62031/udp'
             #Change the below to inlude ports used for your OBP(s)
             - '62041:62041/udp'
-        image: 'gitlab.hacknix.net:5050/hacknix/freedmr:latest'
+            - '8000:8000'
+        image: 'registry.gitlab.com/hp3icc/fdmr/adn-server-single:latest'
         restart: "unless-stopped"
         networks:
            app_net:
@@ -48,45 +48,25 @@ services:
             - FDPROXY_DEBUG=0
             #Override proxy external port
             #- FDPROXY_LISTENPORT=62031
-        read_only: "true"
 
-    freedmrmonitor2:
-        container_name: freedmrmonitor2
-        cpu_shares: 512
-        depends_on:
-            - freedmr
-        image: 'gitlab.hacknix.net:5050/freedmr/freedmrmonitor2/freedmrmonitor2:monitor-latest'
-        restart: "unless-stopped"
-        networks:
-           app_net:
-             ipv4_address: 172.16.238.20
-        read_only: "true"
-        logging:
-              driver: json-file
 
-
-    freedmrmonpache:
-        container_name: freedmrmonapache
+    adn-dashboard:
+        container_name: adn-dashboard
         cpu_shares: 512
-        depends_on:
-             - freedmrmonitor2
-        #where to store TLS certificates
-        #and acme.sh files
         volumes:
-             - '/etc/freedmr/certs/:/opt/apachecerts/'
-             - '/etc/freedmr/acme.sh:/root/.acme.sh/'
+             - '/etc/freedmr/fdmr-mon.cfg:/opt/FDMR-Monitor/fdmr-mon.cfg'
         ports:
             - '80:80/tcp'
             - '443:443/tcp'
-        image: 'gitlab.hacknix.net:5050/freedmr/freedmrmonitor2/freedmrmonitor2:apache-latest'
+            - '9000:9000'
+        image: 'registry.gitlab.com/hp3icc/fdmr/adn-mon2-single:latest'
         restart: "unless-stopped"
-        environment:
-          #Set to 1 to enable TLS support
+          #Set USE_SSL = to True to enable TLS support
           #you'll need to actually generate the certtificates too
           #using these commands when the container is running:
 
-          #docker exec -it freedmrmonapache gencert.sh <admin email> <server FQDN>
-          #docker-compose restart freedmrmonapache
+          #docker exec -it adn-dashboard gencert.sh <admin email> <server FQDN>
+          #docker-compose restart adn-dashboard
 
           #This only needs to be done once - unless the files in the volumes above are deleted.
 
@@ -94,10 +74,9 @@ services:
 
           #Note -the gencert.sh script only works when the webserver is available on the default port 80  
           #If it's on non-standard ports, you'll need to request the certificates manually. 
-          - 'USE_TLS=1'
         networks:
            app_net:
-             ipv4_address: 172.16.238.30
+             ipv4_address: 172.16.238.20
         logging:
               driver: json-file