From a9729491a8461fec8de26df07fa07a7580a7d109 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 4 Jun 2019 16:53:58 +1200 Subject: [PATCH] dockersetup: use docker-compose exec instead of docker exec Good for consistency, but also useful once we remove the hardcoded container names from docker-compose.yml. Signed-off-by: Paul Eggleton --- dockersetup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dockersetup.py b/dockersetup.py index fe73af4..c5ad175 100755 --- a/dockersetup.py +++ b/dockersetup.py @@ -595,7 +595,7 @@ while True: env = os.environ.copy() env['MYSQL_PWD'] = dbapassword # Dummy command, we just want to establish that the db can be connected to - return_code = subprocess.call("echo | docker exec -i -e MYSQL_PWD layersdb mysql -uroot layersdb", shell=True, env=env) + return_code = subprocess.call("echo | docker-compose exec -T -e MYSQL_PWD layersdb mysql -uroot layersdb", shell=True, env=env) if return_code == 0: break else: @@ -611,7 +611,7 @@ if not updatemode: catcmd = 'cat' env = os.environ.copy() env['MYSQL_PWD'] = dbapassword - return_code = subprocess.call("%s %s | docker exec -i -e MYSQL_PWD layersdb mysql -uroot layersdb" % (catcmd, quote(dbfile)), shell=True, env=env) + return_code = subprocess.call("%s %s | docker-compose exec -T -e MYSQL_PWD layersdb mysql -uroot layersdb" % (catcmd, quote(dbfile)), shell=True, env=env) if return_code != 0: print("Database import failed") sys.exit(1) @@ -639,7 +639,7 @@ if not updatemode: # (avoids password being visible through ps or /proc//cmdline) env = os.environ.copy() env['MYSQL_PWD'] = dbapassword - return_code = subprocess.call("docker exec -i -e MYSQL_PWD layersdb mysql -uroot layersdb < " + quote(sqlscriptfile), shell=True, env=env) + return_code = subprocess.call("docker-compose exec -T -e MYSQL_PWD layersdb mysql -uroot layersdb < " + quote(sqlscriptfile), shell=True, env=env) if return_code != 0: print("Creating database user failed") sys.exit(1)