Update for new docker dash

docker-configs/docker-compose.yml

@@ -52,45 +52,35 @@ services:
             #- FDPROXY_LISTENPORT=62031
         read_only: "true"
 
-    freedmrmon:
+   freedmrmonitor2:
-        container_name: freedmrmon
+        container_name: freedmrmonitor2
         cpu_shares: 512
         depends_on:
             - freedmr
-        volumes:
+        image: 'gitlab.hacknix.net:5050/freedmr/freedmrmonitor2/freedmrmonitor2:monitor-latest'
-            #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'
         restart: "unless-stopped"
         networks:
            app_net:
              ipv4_address: 172.16.238.20
-     
+        read_only: "true"
-    freedmrmonpache:
+        logging:
+              driver: json-file
+
+
+    freedmrmonapache:
         container_name: freedmrmonapache
         cpu_shares: 512
         depends_on:
-             - freedmrmon
+             - freedmrmonitor2
-        #Use to override html files
-        #And images
-        #volumes:
-        #    - '/var/www/html/:/var/www/html/'
-        #    - '/var/www/html/images/:/var/www/html/images/'
         ports:
-            - '80:80/tcp'
+            - '8080:80/tcp'
-        image: hacknix/freedmrmonitor-apache:latest
+        image: 'gitlab.hacknix.net:5050/freedmr/freedmrmonitor2/freedmrmonitor2:apache-latest'
         restart: "unless-stopped"
         networks:
            app_net:
              ipv4_address: 172.16.238.30
+        logging:
+              driver: json-file
 
 networks:
   app_net: