diff --git a/Dockerfile-dev b/Dockerfile-dev index c44b4f3..260585f 100644 --- a/Dockerfile-dev +++ b/Dockerfile-dev @@ -4,6 +4,7 @@ LABEL maintainer "contact@ipdb.global" RUN apt-get update \ && apt-get install -y git zsh\ + && apt-get install -y tarantool-common\ && pip install -U pip \ && apt-get autoremove \ && apt-get clean @@ -15,7 +16,7 @@ ARG abci_status # to force stdin, stdout and stderr to be totally unbuffered and to capture logs/outputs ENV PYTHONUNBUFFERED 0 -ENV PLANETMINT_DATABASE_PORT 27017 +ENV PLANETMINT_DATABASE_PORT 3303 ENV PLANETMINT_DATABASE_BACKEND $backend ENV PLANETMINT_SERVER_BIND 0.0.0.0:9984 ENV PLANETMINT_WSSERVER_HOST 0.0.0.0 diff --git a/planetmint/backend/tarantool/connection.py b/planetmint/backend/tarantool/connection.py index 6b18672..0cbd38c 100644 --- a/planetmint/backend/tarantool/connection.py +++ b/planetmint/backend/tarantool/connection.py @@ -63,7 +63,7 @@ class TarantoolDB: import subprocess print(f" commands: {command}") ret = subprocess.Popen( - ['%s %s:%s < %s' % ("tarantoolctl connect", "localhost", "3303", command)], + ['%s %s:%s < %s' % ("tarantoolctl connect", self.host, self.port, command)], stdin=subprocess.PIPE, stdout=subprocess.PIPE, universal_newlines=True, diff --git a/tests/conftest.py b/tests/conftest.py index dc35da2..c1efc21 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -17,6 +17,7 @@ import tempfile from collections import namedtuple from logging import getLogger from logging.config import dictConfig +from planetmint.backend.connection import Connection import pytest # from pymongo import MongoClient @@ -117,7 +118,7 @@ def _setup_database(_configure_planetmint): # TODO Here is located setup databa print('Deleting `{}` database') - db_conn = TarantoolDB("localhost", 3303) + db_conn = Connection() db_conn.drop_database() db_conn.init_database() print('Finished deleting ``') @@ -126,7 +127,7 @@ def _setup_database(_configure_planetmint): # TODO Here is located setup databa print('Initializing test db') - db_conn2 = TarantoolDB("localhost", 3303) + db_conn2 = Connection() db_conn2.drop_database() print('Finishing init database')