django-repositories/fabric
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed problem with docker ip when running on local machine, just give it localhost

Browse source
This commit is contained in:
ronnyabraham 2022-05-08 12:28:19 +03:00
parent fe5c77a5bf
commit cfa2b79788
3 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/database.py
View file

@ -118,6 +118,8 @@ def execute_sql(script_name, add_dbname=True, is_admin=False):
if env.debug: if env.debug:
logger.debug("db_name = %s" % db_name) logger.debug("db_name = %s" % db_name)
logger.debug("run( %s ) " % psql_command) logger.debug("run( %s ) " % psql_command)
logger.debug("configuration.server.database.host: %s" %
configuration.server.database.host)
else: else:
run_database_command(psql_command, user) run_database_command(psql_command, user)

16
modules/docker.py
View file

@ -10,7 +10,6 @@ from .utils import executize
@task @task
def docker_ip(): def docker_ip():
configuration = env.config configuration = env.config
_execute = executize("run")
# in the configuration file under docker,database, if host is set to local # in the configuration file under docker,database, if host is set to local
# use docker-machine, because it means we are probably on OSX # use docker-machine, because it means we are probably on OSX
@ -19,14 +18,17 @@ def docker_ip():
# return the host ip address that we set in configuration # return the host ip address that we set in configuration
if configuration.docker.database.host == 'local': if configuration.docker.database.host == 'local':
docker_cmd = 'docker-machine ip %s' % \ # docker_cmd = 'docker-machine ip %s' % \
configuration.docker.machine # configuration.docker.machine
docker_cmd = "docker inspect -f '{{" # docker_cmd = "docker inspect -f '{{"
docker_cmd += "range.NetworkSettings.Networks}}" # docker_cmd += "range.NetworkSettings.Networks}}"
docker_cmd += "{{.IPAddress}}{{end}}' pedantic_tu" # docker_cmd += "{{.IPAddress}}{{end}}' pedantic_tu"
return _execute(docker_cmd) # _execute = executize("run")
# return _execute(docker_cmd)
return "localhost"
else: else:
return configuration.docker.database.host return configuration.docker.database.host

15
modules/initialize.py
View file

@ -4,7 +4,7 @@ import fabric.utils
from . import maintenance from . import maintenance
from fabric.api import env, task from fabric.api import env, task
# from utils import loggify from .utils import loggify
# import configuration values from PRJ_ROOT/sites/meta/configuration # import configuration values from PRJ_ROOT/sites/meta/configuration
@ -522,12 +522,25 @@ def _init_database(configuration, config, layout):
initialize the database server information initialize the database server information
""" """
if env.debug:
logger = loggify('initialize', '_init_database')
configuration.server.addbranch('database') configuration.server.addbranch('database')
configuration.server.database.name = config['database']['name'] configuration.server.database.name = config['database']['name']
configuration.server.database.port = config['database']['port'] configuration.server.database.port = config['database']['port']
configuration.server.database.host = config['database']['host'] configuration.server.database.host = config['database']['host']
if env.debug:
logger.debug("server.database.name: %s"
% configuration.server.database.name)
logger.debug("server.database.port: %s"
% configuration.server.database.port)
logger.debug("server.database.host: %s"
% configuration.server.database.host)
configuration.server.database.backend = config['database']['backend'] configuration.server.database.backend = config['database']['backend']
configuration.server.database.user = \ configuration.server.database.user = \