[FIX] env settings

.env

@@ -4,10 +4,10 @@ DEBUG = True
 JWT_ACCEPT_HEADER = 'HTTP_AUTHORIZATION'
 JWT_PREFIX_HEADER = 'JWT'
 JWT_SECRET_KEY = '123456789'
-SERVER_IP = '192.168.88.100'
+EXTERNAL_IP = '127.0.0.1'
+INTERNAL_IP = '172.10.0.1'
+INTERNAL_NETWORK_NAME = 'eiru'
 DOCKER_SOCK_DIR = '/var/run/docker.sock'
-DOCKER_NETWORK = '127.0.0.1'
-DOCKER_NETWORK_NAME = 'eiru'
 DOCKER_FILTERS = 'postgres, automation, mattermost'
 ODOO_IMAGE = 'odoo/robert:8.0'
 ODOO_ROOT_PATH = '/opt/odoo/'

api/resources/odoo_resource.py

@@ -219,7 +219,7 @@ class OdooResource(Resource):
         return self.create_response(request, {
             'action': {
                 'type': 'redirect',
-                'ip': settings.SERVER_IP,
+                'ip': settings.EXTERNAL_IP,
                 'port': port
             }
         })

api/utils/odoo_api.py

@@ -55,7 +55,7 @@ def check_port(port=0):
     s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 
     try:
-        s.bind((settings.DOCKER_NETWORK, port))
+        s.bind((settings.EXTERNAL_IP, port))
         ok = True
     except socket.error:
         ok = False
@@ -170,7 +170,7 @@ def create_odoo_container(name=None, ports=[]):
         'mode': 'rw'
     })  , settings.ODOO_DEFAULT_FOLDERS))
 
-    run_container(settings.ODOO_IMAGE, name, ports, volumes, settings.DOCKER_NETWORK_NAME)
+    run_container(settings.ODOO_IMAGE, name, ports, volumes, settings.INTERNAL_NETWORK_NAME)
     
     time.sleep(5)
 

odoo_control/settings.py

@@ -85,10 +85,10 @@ DEBUG = config('DEBUG', default=False, cast=bool)
 JWT_ACCEPT_HEADER = config('JWT_ACCEPT_HEADER')
 JWT_PREFIX_HEADER = config('JWT_PREFIX_HEADER')
 JWT_SECRET_KEY = config('JWT_SECRET_KEY')
-SERVER_IP = config('SERVER_IP')
+EXTERNAL_IP = config('EXTERNAL_IP')
+INTERNAL_IP = config('INTERNAL_IP')
+INTERNAL_NETWORK_NAME = config('INTERNAL_NETWORK_NAME', 'default')
 DOCKER_SOCK_DIR = config('DOCKER_SOCK_DIR')
-DOCKER_NETWORK = config('DOCKER_NETWORK')
-DOCKER_NETWORK_NAME = config('DOCKER_NETWORK_NAME', 'default')
 DOCKER_FILTERS = config('DOCKER_FILTERS', cast=Csv())
 ODOO_IMAGE = config('ODOO_IMAGE')
 ODOO_ROOT_PATH = config('ODOO_ROOT_PATH')