diff --git a/.DS_Store b/.DS_Store index 760344a..e8fa70f 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.deploy/deploy-dev.yaml b/.deploy/deploy-dev.yaml index efb07b6..ba19735 100644 --- a/.deploy/deploy-dev.yaml +++ b/.deploy/deploy-dev.yaml @@ -6,9 +6,7 @@ services: image: mathwave/sprint-repo:certupdater command: worker environment: - MINIO_HOST: "minio.develop.sprinthub.ru" MINIO_SECRET_KEY: $MINIO_SECRET_KEY_DEV - MONGO_HOST: "mongo.develop.sprinthub.ru" MONGO_PASSWORD: $MONGO_PASSWORD_DEV STAGE: "development" volumes: @@ -16,6 +14,8 @@ services: networks: - configurator - queues-development + - minio-development + - mongo-development deploy: mode: replicated restart_policy: @@ -31,3 +31,7 @@ networks: external: true queues-development: external: true + minio-development: + external: true + mongo-development: + external: true diff --git a/.deploy/deploy-prod.yaml b/.deploy/deploy-prod.yaml index 9119102..f3b239b 100644 --- a/.deploy/deploy-prod.yaml +++ b/.deploy/deploy-prod.yaml @@ -6,9 +6,7 @@ services: image: mathwave/sprint-repo:certupdater command: worker environment: - MINIO_HOST: "minio.sprinthub.ru" MINIO_SECRET_KEY: $MINIO_SECRET_KEY_PROD - MONGO_HOST: "mongo.sprinthub.ru" MONGO_PASSWORD: $MONGO_PASSWORD_PROD STAGE: "production" volumes: @@ -16,6 +14,8 @@ services: networks: - configurator - queues + - minio + - mongo deploy: mode: replicated restart_policy: @@ -31,3 +31,7 @@ networks: external: true queues: external: true + minio: + external: true + mongo: + external: true diff --git a/blob.py b/blob.py index 38fb9e6..e06bc8f 100644 --- a/blob.py +++ b/blob.py @@ -1,7 +1,7 @@ import os from minio import Minio -MINIO_HOST = os.getenv("MINIO_HOST", "localhost") + ":9000" +MINIO_HOST = "minio:9000" MINIO_ACCESS_KEY = os.getenv("MINIO_ACCESS_KEY", "serviceminioadmin") MINIO_SECRET_KEY = os.getenv("MINIO_SECRET_KEY", "minioadmin") diff --git a/mongo.py b/mongo.py index 0fcb1ec..c5fae4f 100644 --- a/mongo.py +++ b/mongo.py @@ -4,12 +4,11 @@ import os MONGO_USER = os.getenv("MONGO_USER", "mongo") MONGO_PASSWORD = os.getenv("MONGO_PASSWORD", "password") -MONGO_HOST = os.getenv("MONGO_HOST", "localhost") class Mongo: def __init__(self): - url = f"mongodb://{MONGO_USER}:{MONGO_PASSWORD}@{MONGO_HOST}:27017/" + url = f"mongodb://{MONGO_USER}:{MONGO_PASSWORD}@mongo:27017/" self.client: pymongo.MongoClient = pymongo.MongoClient(url) self.database = self.client.get_database("certupdater") self.hosts_collection.create_index([