From fbc7fe94555b57769d6e5002f1de7437b4aed761 Mon Sep 17 00:00:00 2001 From: Valentin Lab Date: Thu, 22 Aug 2019 22:46:54 +0200 Subject: [PATCH] fix: can't check from inside docker if host file exists. This check can't be done, but the default standard location where it should have been bind mounted should be testable. This is done on the charm's end. --- bin/compose-core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/compose-core b/bin/compose-core index 5be316f..e304e2a 100755 --- a/bin/compose-core +++ b/bin/compose-core @@ -818,7 +818,7 @@ _dcmd() { debug "Db> $command $@" - if [ -f "$HOST_DB_PASSFILE" -a "$CLIENT_DB_PASSFILE" ]; then + if [ "$HOST_DB_PASSFILE" -a -f "$LOCAL_DB_PASSFILE" -a "$CLIENT_DB_PASSFILE" ]; then verb "Found and using '$HOST_DB_PASSFILE' as '$CLIENT_DB_PASSFILE'." docker_opts=("${db_docker_opts[@]}" "-v" "$HOST_DB_PASSFILE:$CLIENT_DB_PASSFILE") else