From 1a73ebd4344a8af86bbcbac8afdf4c7940deaaae Mon Sep 17 00:00:00 2001
From: "Esteban Mackay Q." <setcom40@gmail.com>
Date: Fri, 11 Apr 2025 12:20:46 -0500
Subject: [PATCH] update docker

update docker-compose.yml
---
 docker-configs/docker-compose.yml  | 33 +++++++++++++-----------------
 docker-configs/docker-compose2.yml | 25 ++++++++++++++++++++--
 2 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/docker-configs/docker-compose.yml b/docker-configs/docker-compose.yml
index 4fff702..a7a51de 100644
--- a/docker-configs/docker-compose.yml
+++ b/docker-configs/docker-compose.yml
@@ -23,42 +23,37 @@ services:
         container_name: adn-server
         cpu_shares: 1024
         mem_reservation: 600m
+         # Before enabling local mapping, download the file to the host machine: 
+         # docker cp adn-server:/opt/ADN-DMR-Peer-Server/config/adn.cfg .
         volumes:
-            - '/etc/ADN-Systems/adn.cfg:/opt/ADN-DMR-Peer-Server/config/adn.cfg'
+            - './adn.cfg:/opt/ADN-DMR-Peer-Server/config/adn.cfg'
+         # Change the below to inlude ports used for your OBP(s)
         ports:
             - '62031:62031/udp'
-            #Change the below to inlude ports used for your OBP(s)
-            - '62041:62041/udp'
-            - '8000:8000'
+#            - '62041:62041/udp'
+        # For x86_64 host devices use tag :latest , and for Raspberry arm64 / arch64 devices use tag :rpi
         image: 'registry.gitlab.com/hp3icc/fdmr/adn-server-single:latest'
         restart: "unless-stopped"
         logging:
           driver: none
         networks:
           - bridge
-        #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
-
 
     adn-dashboard:
         container_name: adn-dashboard
         cpu_shares: 512
+         # Before enabling local mapping, download the file to the host machine: 
+         # docker cp monitor:/opt/FDMR-Monitor/fdmr-mon.cfg .
         volumes:
-             - '/etc/ADN-Systems/fdmr-mon.cfg:/opt/FDMR-Monitor/fdmr-mon.cfg'
+             - './fdmr-mon.cfg:/opt/FDMR-Monitor/fdmr-mon.cfg'
+#             - './logo.png:/var/www/html/img/logo.png:ro'
+#             - './bk.jpg:/var/www/html/img/bk.jpg:ro'
+#             - './favicon.ico:/var/www/html/img/favicon.ico:ro'
         ports:
             - '80:80/tcp'
-            - '443:443/tcp'
+           # - '443:443/tcp'
             - '9000:9000'
+        # For x86_64 host devices use tag :latest , and for Raspberry arm64 / arch64 devices use tag :rpi
         image: 'registry.gitlab.com/hp3icc/fdmr/adn-mon2-single:latest'
         restart: "unless-stopped"
           #Set USE_SSL = to True to enable TLS support
diff --git a/docker-configs/docker-compose2.yml b/docker-configs/docker-compose2.yml
index b6ba51d..300c2d5 100644
--- a/docker-configs/docker-compose2.yml
+++ b/docker-configs/docker-compose2.yml
@@ -1,3 +1,21 @@
+###############################################################################  
+#
+#   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
+#   the Free Software Foundation; either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   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:
 
@@ -9,8 +27,8 @@ services:
          # docker cp adn-server:/opt/ADN-DMR-Peer-Server/config/adn.cfg .
         volumes:
             - './adn.cfg:/opt/ADN-DMR-Peer-Server/config/adn.cfg:ro'
+         # Change the below to inlude ports used for your OBP(s)
 #        ports:
-            #Change the below to inlude ports used for your OBP(s)
 #            - '62041:62041/udp'
         # For x86_64 host devices use tag :latest , and for Raspberry arm64 / arch64 devices use tag :rpi
         image: 'registry.gitlab.com/hp3icc/fdmr/adn-server-self-service:latest'
@@ -41,9 +59,12 @@ services:
          # docker cp monitor:/opt/FDMR-Monitor/fdmr-mon.cfg .
         volumes:
              - './fdmr-mon.cfg:/opt/FDMR-Monitor/fdmr-mon.cfg:ro'
+#             - './logo.png:/var/www/html/img/logo.png:ro'
+#             - './bk.jpg:/var/www/html/img/bk.jpg:ro'
+#             - './favicon.ico:/var/www/html/img/favicon.ico:ro'
         ports:
             - '80:80/tcp'
-            - '443:443/tcp'
+           # - '443:443/tcp'
             - '9000:9000'
             - '62031:62031/udp'
         depends_on: