diff --git a/functions b/functions index 082a723..4b2d62a 100755 --- a/functions +++ b/functions @@ -98,12 +98,12 @@ service_import() { local SERVICE="$1" SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE" SERVICE_NAME="$(get_service_name "$SERVICE")" - PASSWORD="$(cat "$SERVICE_ROOT/PASSWORD")" + ROOTPASSWORD="$(cat "$SERVICE_ROOT/ROOTPASSWORD")" if [[ -t 0 ]]; then dokku_log_fail "No data provided on stdin." fi - docker exec -i "$SERVICE_NAME" mysql --user=mysql --password="$PASSWORD" "$SERVICE" + docker exec -i "$SERVICE_NAME" mysql --user=root --password="$ROOTPASSWORD" "$SERVICE" } service_start() { diff --git a/tests/service_import.bats b/tests/service_import.bats index a65da5d..fceef41 100755 --- a/tests/service_import.bats +++ b/tests/service_import.bats @@ -31,7 +31,7 @@ teardown() { @test "($PLUGIN_COMMAND_PREFIX:import) success" { export ECHO_DOCKER_COMMAND="true" run dokku "$PLUGIN_COMMAND_PREFIX:import" l < "$PLUGIN_DATA_ROOT/fake.sql" - password="$(cat "$PLUGIN_DATA_ROOT/l/PASSWORD")" - assert_output "docker exec -i dokku.mysql.l mysql --user=mysql --password=$password l" + password="$(cat "$PLUGIN_DATA_ROOT/l/ROOTPASSWORD")" + assert_output "docker exec -i dokku.mysql.l mysql --user=root --password=$password l" }