From 8439ebbb7701ff20963ab41271dac89b2457f09c Mon Sep 17 00:00:00 2001
From: Christian 'ketura' McCarty <hyperlink.teltura@gmail.com>
Date: Tue, 26 Jan 2021 21:19:44 -0600
Subject: [PATCH] Docker Update

Fixed net naming schema for hopefully the last time.  Added a log file binding so that gemp logs can be accessed outside the container.
---
 gemp-lotr/docker/.env               |  4 ++--
 gemp-lotr/docker/docker-compose.yml | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/gemp-lotr/docker/.env b/gemp-lotr/docker/.env
index 3c530844d..63210db1d 100644
--- a/gemp-lotr/docker/.env
+++ b/gemp-lotr/docker/.env
@@ -3,11 +3,11 @@ COMPOSE_PROJECT_NAME=gemp_${SERVID}
 
 APP_CONTAINER_NAME=gemp_app_${SERVID}
 APP_IP=172.28.${SERVID}.2
-APP_PORT=17001
+APP_PORT=1700${SERVID}
 
 DB_CONTAINER_NAME=gemp_db_${SERVID}
 DB_IP=172.28.${SERVID}.3
-DB_PORT=35001
+DB_PORT=3500${SERVID}
 
 MYSQL_ROOT_PASSWORD=rootpass
 MYSQL_DATABASE=gemp_db
diff --git a/gemp-lotr/docker/docker-compose.yml b/gemp-lotr/docker/docker-compose.yml
index 6a75c7b30..083a7fedb 100644
--- a/gemp-lotr/docker/docker-compose.yml
+++ b/gemp-lotr/docker/docker-compose.yml
@@ -29,8 +29,11 @@ services:
        - type: bind
          source: ../gemp-lotr-async/src/main/web
          target: /var/www/localhost/htdocs/gemp-lotr #/etc/apache2/htdocs/gemp-lotr
+       - type: bind
+         source: ../../logs
+         target: /logs
     networks:
-      gemp_net:
+      gemp_net_1:
         ipv4_address: ${APP_IP}
     tty: true
     #command: nohup java -jar /etc/gemp-lotr/gemp-lotr-async/target/web.jar &
@@ -55,13 +58,13 @@ services:
          source: ../../database
          target: /var/lib/mysql
     networks:
-      gemp_net:
+      gemp_net_1:
         ipv4_address: ${DB_IP}
       
   
 networks:
-  gemp_net:
+  gemp_net_1:
     ipam:
       driver: default
       config:
-        - subnet: 172.28.0.0/16
\ No newline at end of file
+        - subnet: 172.28.1.0/24
\ No newline at end of file