Merge pull request #246 from g0es/master

Set default mongo port on retrieval, pin pydantic version.
nsacyber · Dec 2, 2019 · f4195d8 · f4195d8
2 parents f1a6e0f + 59c2507
commit f4195d8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/api/requirements.txt b/api/requirements.txt
@@ -1,4 +1,5 @@
 APscheduler >= 3.0.0
+pydantic == 0.32.2
 pyyaml >= 3.0
 passlib >= 1.7.0
 semver

diff --git a/api/server/db/mongo/__init__.py b/api/server/db/mongo/__init__.py
@@ -11,12 +11,12 @@ def __init__(self):
         self.async_client = motor.motor_asyncio.AsyncIOMotorClient(username=config.DB_USERNAME,
                                                                    password=config.get_from_file(config.MONGO_KEY_PATH),
                                                                    host=config.MONGO_HOST,
-                                                                   port=config.get_int("MONGO_PORT"))
+                                                                   port=config.get_int("MONGO_PORT",27016))
 
         self.reg_client = pymongo.MongoClient(username=config.DB_USERNAME,
                                               password=config.get_from_file(config.MONGO_KEY_PATH),
                                               host=config.MONGO_HOST,
-                                              port=config.get_int("MONGO_PORT"))
+                                              port=config.get_int("MONGO_PORT",27016))
 
         self.init_db()
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,4 @@
+pydantic == 0.32.2
 #aiodns
 aiodocker
 aiohttp

diff --git a/umpire/requirements.txt b/umpire/requirements.txt
@@ -1,3 +1,4 @@
+pydantic == 0.32.2
 docker
 docker-compose
 minio
@@ -10,5 +11,4 @@ six
 redis
 uvicorn
 tenacity
-pydantic
 email-validator