update deployments

2024-03-14 14:16:10 +03:00 · 2024-03-14 14:16:10 +03:00 · 6b80eeaaa3
commit 6b80eeaaa3
parent 3588186d4a
6 changed files with 3 additions and 195 deletions
--- a/deployments/main/docker-compose.yaml
+++ b/deployments/main/docker-compose.yaml
@ -1,61 +1,4 @@
 services:
-  core:
-    hostname: squiz-core
-    container_name: squiz-core
-    image: $CI_REGISTRY_IMAGE/main-core:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
-    tty: true
-    environment:
-      HUB_ADMIN_URL: 'http://10.8.0.8:59303'
-      IS_PROD_LOG: 'false'
-      IS_PROD: 'false'
-      PORT: 1488
-      PUBLIC_ACCESS_SECRET_KEY: $JWT_PUBLIC_KEY
-      PG_CRED: 'host=10.8.0.9 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable'
-      AUTH_URL: 'http://10.8.0.8:59300/user'
-    ports: 
-      - 10.8.0.9:1488:1488
-
-  storer:
-    hostname: squiz-storer
-    container_name: squiz-storer
-    image: $CI_REGISTRY_IMAGE/main-storer:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
-    tty: true
-    environment:
-      IS_PROD_LOG: 'false'
-      IS_PROD: 'false'
-      PUBLIC_ACCESS_SECRET_KEY: $JWT_PUBLIC_KEY
-      PORT: 1489
-      MINIO_EP: 'storage.yandexcloud.net'
-      MINIO_AK: 'YCAJEOcqqTHpiwL4qFwLfHPNA'
-      MINIO_SK: 'YCNIAIat0XqdDzycWsYKX3OU7mPor6S0WmMoG4Ry'
-      PG_CRED: 'host=10.8.0.9 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable'
-    ports: 
-      - 10.8.0.9:1489:1489
-  worker:
-    hostname: squiz-worker
-    container_name: squiz-worker
-    image: $CI_REGISTRY_IMAGE/main-worker:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
-    tty: true
-    environment:
-      IS_PROD_LOG: 'false'
-      IS_PROD: 'false'
-      PG_CRED: 'host=10.8.0.9 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable'
-      KAFKA_BROKER: '10.8.0.8:9092'
-      KAFKA_TOPIC: 'tariffs'
-      QUIZ_ID: quizCnt
-      AMOUNT: 10
-      UNLIM_ID: quizUnlimTime
-      REDIS_HOST: '10.8.0.9:6379'
-      REDIS_PASSWORD: 'Redalert2'
-      REDIS_DB: 2
-      SMTP_API_URL: 'https://api.smtp.bz/v1/smtp/send'
-      SMTP_HOST: 'connect.smtp.bz'
-      SMTP_PORT: '587'
-      SMTP_UNAME: 'team@pena.digital'
-      SMTP_PASS: 'AyMfwqA9LkQH'
-      SMTP_API_KEY: '8tv2xcsfCMBX3TCQxzgeeEwAEYyQrPUp0ggw'
-      SMTP_SENDER: 'recovery@noreply.pena.digital'    
-      CUSTOMER_SERVICE_ADDRESS: 'http://10.8.0.8:8065/'
  answerer:
    hostname: squiz-answerer
    container_name: squiz-answerer
--- a/deployments/main/staging/docker-compose.yaml
+++ b/deployments/main/staging/docker-compose.yaml
@ -1,61 +1,4 @@
 services:
-  core:
-    hostname: squiz-core
-    container_name: squiz-core
-    image: $CI_REGISTRY_IMAGE/core:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
-    tty: true
-    environment:
-      HUB_ADMIN_URL: 'http://10.6.0.11:59303'
-      IS_PROD_LOG: 'false'
-      IS_PROD: 'false'
-      PORT: 1488
-      PUBLIC_ACCESS_SECRET_KEY: $JWT_PUBLIC_KEY
-      PG_CRED: 'host=10.6.0.23 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable'
-      AUTH_URL: 'http://10.6.0.11:59300/user'
-    ports: 
-      - 1488:1488
-
-  storer:
-    hostname: squiz-storer
-    container_name: squiz-storer
-    image: $CI_REGISTRY_IMAGE/storer:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
-    tty: true
-    environment:
-      IS_PROD_LOG: 'false'
-      IS_PROD: 'false'
-      PUBLIC_ACCESS_SECRET_KEY: $JWT_PUBLIC_KEY
-      PORT: 1489
-      MINIO_EP: 'storage.yandexcloud.net'
-      MINIO_AK: 'YCAJEOcqqTHpiwL4qFwLfHPNA'
-      MINIO_SK: 'YCNIAIat0XqdDzycWsYKX3OU7mPor6S0WmMoG4Ry'
-      PG_CRED: 'host=10.6.0.23 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable'
-    ports: 
-      - 1489:1489
-  worker:
-    hostname: squiz-worker
-    container_name: squiz-worker
-    image: $CI_REGISTRY_IMAGE/worker:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
-    tty: true
-    environment:
-      IS_PROD_LOG: 'false'
-      IS_PROD: 'false'
-      PG_CRED: 'host=10.6.0.23 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable'
-      KAFKA_BROKER: '10.6.0.11:9092'
-      KAFKA_TOPIC: 'tariffs'
-      QUIZ_ID: quizCnt
-      AMOUNT: 10
-      UNLIM_ID: quizUnlimTime
-      REDIS_HOST: '10.6.0.23:6379'
-      REDIS_PASSWORD: 'Redalert2'
-      REDIS_DB: 2
-      SMTP_HOST: 'connect.mailclient.bz'
-      SMTP_PORT: '587'
-      SMTP_SENDER: 'noreply@mailing.pena.digital'
-      SMTP_IDENTITY: ''
-      SMTP_USERNAME: 'kotilion.95@gmail.com'
-      SMTP_PASSWORD: 'vWwbCSg4bf0p'
-      SMTP_API_KEY: 'P0YsjUB137upXrr1NiJefHmXVKW1hmBWlpev'
-      CUSTOMER_SERVICE_ADDRESS: 'http://10.6.0.11:8065/'
  answerer:
    hostname: squiz-answerer
    container_name: squiz-answerer
--- a/deployments/staging/docker-compose.yaml
+++ b/deployments/staging/docker-compose.yaml
@ -1,61 +1,4 @@
 services:
-  core:
-    hostname: squiz-core
-    container_name: squiz-core
-    image: $CI_REGISTRY_IMAGE/staging-core:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
-    tty: true
-    environment:
-      HUB_ADMIN_URL: 'http://10.6.0.11:59303'
-      IS_PROD_LOG: 'false'
-      IS_PROD: 'false'
-      PORT: 1488
-      PUBLIC_ACCESS_SECRET_KEY: $JWT_PUBLIC_KEY
-      PG_CRED: 'host=10.6.0.23 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable'
-      AUTH_URL: 'http://10.6.0.11:59300/user'
-    ports: 
-      - 1488:1488
-
-  storer:
-    hostname: squiz-storer
-    container_name: squiz-storer
-    image: $CI_REGISTRY_IMAGE/staging-storer:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
-    tty: true
-    environment:
-      IS_PROD_LOG: 'false'
-      IS_PROD: 'false'
-      PUBLIC_ACCESS_SECRET_KEY: $JWT_PUBLIC_KEY
-      PORT: 1489
-      MINIO_EP: 'storage.yandexcloud.net'
-      MINIO_AK: 'YCAJEOcqqTHpiwL4qFwLfHPNA'
-      MINIO_SK: 'YCNIAIat0XqdDzycWsYKX3OU7mPor6S0WmMoG4Ry'
-      PG_CRED: 'host=10.6.0.23 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable'
-    ports: 
-      - 1489:1489
-  worker:
-    hostname: squiz-worker
-    container_name: squiz-worker
-    image: $CI_REGISTRY_IMAGE/staging-worker:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
-    tty: true
-    environment:
-      IS_PROD_LOG: 'false'
-      IS_PROD: 'false'
-      PG_CRED: 'host=10.6.0.23 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable'
-      KAFKA_BROKER: '10.6.0.11:9092'
-      KAFKA_TOPIC: 'tariffs'
-      QUIZ_ID: quizCnt
-      AMOUNT: 10
-      UNLIM_ID: quizUnlimTime
-      REDIS_HOST: '10.6.0.23:6379'
-      REDIS_PASSWORD: 'Redalert2'
-      REDIS_DB: 2
-      SMTP_HOST: 'connect.mailclient.bz'
-      SMTP_PORT: '587'
-      SMTP_SENDER: 'noreply@mailing.pena.digital'
-      SMTP_IDENTITY: ''
-      SMTP_USERNAME: 'kotilion.95@gmail.com'
-      SMTP_PASSWORD: 'vWwbCSg4bf0p'
-      SMTP_API_KEY: 'P0YsjUB137upXrr1NiJefHmXVKW1hmBWlpev'
-      CUSTOMER_SERVICE_ADDRESS: 'http://10.6.0.11:8065/'
  answerer:
    hostname: squiz-answerer
    container_name: squiz-answerer
--- a/deployments/testmigrate/docker-compose.yaml
+++ b/deployments/testmigrate/docker-compose.yaml
@ -1,23 +0,0 @@
-version: '3'
-services:
-  test-postgres:
-    image: postgres
-    environment:
-      POSTGRES_PASSWORD: Redalert2
-      POSTGRES_USER: squiz
-      POSTGRES_DB: squiz
-    ports:
-      - 35432:5432
-    networks:
-      - penatest
-    healthcheck:
-      test: pg_isready -U squiz
-      interval: 2s
-      timeout: 2s
-      retries: 10
-
-networks:
-  penatest:
-
-# просто чтоб тестануть мигрировала ли бд
-# в app/app.go pgdal, err := dal.New(ctx, "host=localhost port=35432 user=squiz password=Redalert2 dbname=squiz sslmode=disable")
--- a/go.mod
+++ b/go.mod
@ -10,7 +10,7 @@ require (
 	github.com/skeris/appInit v1.0.2
 	github.com/themakers/hlog v0.0.0-20191205140925-235e0e4baddf
 	go.uber.org/zap v1.26.0
-	penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240313164312-4560248259a0
+	penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240314111040-7ed859ef7876
 )

 require (
--- a/go.sum
+++ b/go.sum
@ -191,5 +191,7 @@ penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240202120244-c4ef
 penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240202120244-c4ef330cfe5d/go.mod h1:lTmpjry+8evVkXWbEC+WMOELcFkRD1lFMc7J09mOndM=
 penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240313164312-4560248259a0 h1:YbffFOWneoINvEqCWClf5Zatu/a0VNo9RM0nYveCzhk=
 penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240313164312-4560248259a0/go.mod h1:JgbH8cdAJBr3jx3BuY5nnuTyMdZ1XkRxo8a3w4Y3C0Y=
+penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240314111040-7ed859ef7876 h1:875+tdI7KuftCn9hZer2p9vq88FX0gbAaHOeCy1n6T4=
+penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240314111040-7ed859ef7876/go.mod h1:okduDAq0NVVDcM+TMyrd4mVXzBMeTzYI2B2/yi1sL1Y=
 penahub.gitlab.yandexcloud.net/backend/quiz/core.git v0.0.0-20240313165712-63460dc78d4f h1:bb6dpmEKUOA6XjNyW66A8lPNRl4pISrZ2q/7J0C3mkk=
 penahub.gitlab.yandexcloud.net/backend/quiz/core.git v0.0.0-20240313165712-63460dc78d4f/go.mod h1:1L60BR27jRadx5JtRKZHYPM5Lilz5Yg+geFSgY7eCnM=