Skip to content
Snippets Groups Projects
Commit 910fddfe7e39 authored by Vincent Hatakeyama's avatar Vincent Hatakeyama
Browse files

docker dev start: default to using host network instead of docker one (still...

docker dev start: default to using host network instead of docker one (still available as an option)
parent eb9a88e6262e
No related branches found
No related tags found
No related merge requests found
......@@ -22,7 +22,7 @@
__version__ = '0.1.0'
__date__ = '2017-08-11'
__updated__ = '2017-08-17'
__updated__ = '2017-08-24'
def main(argv=None): # IGNORE:C0111
"""Parse arguments and launch conversion
......@@ -86,7 +86,7 @@
'-u',
'--update',
help="Module to update (will also set --i18n-overwrite)"
"[default: %(default)s]",
" [default: %(default)s]",
default=None,
)
parser.add_argument(
......@@ -102,7 +102,18 @@
)
parser.add_argument(
'--create',
help="Create user/database (using your user)",
help="Create user/database (using your user) [default: %(default)s]",
action='store_true',
)
network_group = parser.add_mutually_exclusive_group()
network_group.add_argument(
'--host-network',
help="Use host network [default: %(default)s]",
action='store_false',
)
network_group.add_argument(
'--docker-network',
help="Use docker network [default: %(default)s]",
action='store_true',
)
......@@ -121,6 +132,7 @@
logging.basicConfig(level=logging.DEBUG)
db_user = nmspc.db_user
db_password = nmspc.db_password
use_host_network = nmspc.host_network
if project_name == 'odoo_scripts':
logging.fatal(
......@@ -179,8 +191,8 @@
arg.append('--without-demo %s' % nmspc.database)
# auto detect local ip
ifaceName = 'docker0'
addresses = [i['addr'] for i in ifaddresses(ifaceName).setdefault(AF_INET, [{'addr':'No IP addr'}])]
if addresses:
local_ip = addresses[0]
if use_host_network:
local_ip = '127.0.0.1'
options.append('--network')
options.append('host')
else:
......@@ -186,6 +198,12 @@
else:
import socket
local_ip = [(s.connect(('8.8.8.8', 53)), s.getsockname()[0], s.close()) for s in [socket.socket(socket.AF_INET, socket.SOCK_DGRAM)]][0][1]
ifaceName = 'docker0'
addresses = [i['addr'] for i in ifaddresses(ifaceName).setdefault(AF_INET, [{'addr':'No IP addr'}])]
if addresses:
local_ip = addresses[0]
else:
import socket
local_ip = [(s.connect(('8.8.8.8', 53)), s.getsockname()[0], s.close()) for s in [socket.socket(socket.AF_INET, socket.SOCK_DGRAM)]][0][1]
logging.debug('IP found %s', local_ip)
arg.append('--db_host')
arg.append(local_ip)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment