Merge pull request 'fix' (#58 ) from master into dev

Reviewed-on: #58
fix
2025-09-15 01:33:57 +03:00 · 2025-09-15 01:33:01 +03:00 · 2025-06-12 12:28:44 +03:00 · 2025-06-12 02:46:02 +03:00 · 2025-06-12 02:39:41 +03:00 · 2025-06-12 02:35:21 +03:00
5 changed files with 14 additions and 7 deletions
--- a/.DS_Store
+++ b/.DS_Store
--- 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
--- 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
--- 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")

--- 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([
Author	SHA1	Message	Date
emmatveev	5692346b0d	Merge pull request 'fix' (#58 ) from master into dev Reviewed-on: #58	2025-09-15 01:33:57 +03:00
Egor Matveev	40907f9d07	fix All checks were successful Deploy Dev / Build (pull_request) Successful in 1m16s Details Deploy Dev / Push (pull_request) Successful in 21s Details Deploy Dev / Deploy dev (pull_request) Successful in 10s Details Deploy Prod / Build (pull_request) Successful in 5s Details Deploy Prod / Push (pull_request) Successful in 10s Details Deploy Prod / Deploy prod (pull_request) Successful in 11s Details	2025-09-15 01:33:01 +03:00
emmatveev	23cb51985c	Merge pull request 'fix' (#56 ) from master into dev Reviewed-on: #56	2025-06-12 12:28:44 +03:00
emmatveev	0c5ce6c1eb	Merge pull request 'fix' (#55 ) from master into dev Reviewed-on: #55	2025-06-12 02:46:02 +03:00
emmatveev	a0e06d3ef8	Merge pull request 'fix' (#54 ) from master into dev Reviewed-on: #54	2025-06-12 02:39:41 +03:00
emmatveev	f191d7c07a	Merge pull request 'fix' (#53 ) from master into dev Reviewed-on: #53	2025-06-12 02:35:21 +03:00
emmatveev	8863b7f7ab	Merge pull request 'fix' (#52 ) from master into dev Reviewed-on: #52	2025-06-12 02:25:31 +03:00
emmatveev	41080370c5	Merge pull request 'fix' (#51 ) from master into dev Reviewed-on: #51	2025-06-12 02:19:28 +03:00
emmatveev	ff2fbba1aa	Merge pull request 'fix' (#50 ) from master into dev Reviewed-on: #50	2025-06-12 02:16:02 +03:00
emmatveev	6b9b6cb3b8	Merge pull request 'fix' (#49 ) from master into dev Reviewed-on: #49	2025-06-12 02:10:14 +03:00
emmatveev	9e3becfc17	Merge pull request 'fix' (#47 ) from master into dev Reviewed-on: #47	2025-06-12 01:11:28 +03:00
emmatveev	96a9bd8fc8	Merge pull request 'fix' (#46 ) from master into dev Reviewed-on: #46	2025-06-12 00:54:37 +03:00
emmatveev	75a8a5e307	Merge pull request 'fix' (#45 ) from master into dev Reviewed-on: #45	2025-06-10 02:04:42 +03:00
emmatveev	5dd11e1fc8	Merge pull request 'fix' (#44 ) from master into dev Reviewed-on: #44	2025-06-10 02:02:30 +03:00
emmatveev	d0c26f15e2	Merge pull request 'fix' (#43 ) from master into dev Reviewed-on: #43	2025-06-10 01:49:37 +03:00
emmatveev	560d21c9fe	Merge pull request 'fix' (#42 ) from master into dev Reviewed-on: #42	2025-06-08 11:49:43 +03:00
emmatveev	4f0571ec02	Merge pull request 'fix' (#41 ) from master into dev Reviewed-on: #41	2025-06-08 11:38:38 +03:00
emmatveev	ad5a22e985	Merge pull request 'fix' (#40 ) from master into dev Reviewed-on: #40	2025-06-08 11:05:33 +03:00
emmatveev	d288a8a883	Merge pull request 'fix' (#39 ) from master into dev Reviewed-on: #39	2025-06-08 11:02:19 +03:00
emmatveev	78eeea9e08	Merge pull request 'fix' (#38 ) from master into dev Reviewed-on: #38	2025-06-08 10:59:33 +03:00
emmatveev	1f7cef1f4b	Merge pull request 'fix' (#37 ) from master into dev Reviewed-on: #37	2025-06-07 13:24:10 +03:00
emmatveev	6cedf34b8e	Merge pull request 'master' (#35 ) from master into dev Reviewed-on: #35	2025-06-04 21:08:09 +03:00
emmatveev	df0af634d6	Merge pull request 'fix' (#31 ) from master into dev Reviewed-on: #31	2025-06-04 02:34:37 +03:00
emmatveev	41072ac03f	Merge pull request 'fix' (#30 ) from master into dev Reviewed-on: #30	2025-06-03 22:58:47 +03:00
emmatveev	43191f99a9	Merge pull request 'fix' (#29 ) from master into dev Reviewed-on: #29	2025-06-03 22:44:39 +03:00
emmatveev	41dea63243	Merge pull request 'fix' (#28 ) from master into dev Reviewed-on: #28	2025-06-02 00:19:28 +03:00
emmatveev	ee9c363b56	Merge pull request 'fix' (#27 ) from master into dev Reviewed-on: #27	2025-06-01 20:04:53 +03:00
emmatveev	1ad823a301	Merge pull request 'fix' (#26 ) from master into dev Reviewed-on: #26	2025-06-01 19:58:41 +03:00
emmatveev	ded08985b5	Merge pull request 'fix' (#25 ) from master into dev Reviewed-on: #25	2025-06-01 19:55:24 +03:00
emmatveev	cb847f8b8f	Merge pull request 'fix' (#24 ) from master into dev Reviewed-on: #24	2025-06-01 19:53:30 +03:00
emmatveev	a7b082dc7a	Merge pull request 'master' (#23 ) from master into dev Reviewed-on: #23	2025-06-01 19:51:42 +03:00
emmatveev	741eed066c	Merge pull request 'fix' (#22 ) from master into dev Reviewed-on: #22	2025-06-01 19:48:51 +03:00