refactor deploy envs

deployments/staging/docker-compose.yaml

@@ -1,36 +1,37 @@
-version: "3"
 services:
   verificationv1.0.0:
     container_name: verification_servicev1.0.0
     restart: unless-stopped
-    image: $CI_REGISTRY_IMAGE/staging:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
+    image: gitea.pena:3000/penaside/verification/staging:$GITHUB_RUN_NUMBER
     hostname: verification_servicev1.0.0
     ports:
-      - 10.8.0.6:7036:7035
+      - 10.7.0.6:7036:7035
-      - 10.8.0.6:7037:7036
+      - 10.7.0.6:7037:7036
+      - 10.7.0.6:7137:2345
+    command: dlv --listen=:2345 --headless=true --log=true --log-output=debugger,debuglineerr,gdbwire,lldbout,rpc --accept-multiclient --api-version=2 exec ./app
     environment:
-      MONGO_URI: mongodb://$MONGO_USER:$MONGO_PASSWORD@10.8.0.6:27017/?authSource=verification
-      PENADISK_URL: $PENADISK_URL
       TELEGRAM_TOKEN: $TELEGRAM_TOKEN
       TELEGRAM_CHANNEL_ID: $TELEGRAM_CHANNEL_ID
+      CLIENT_HTTP_URL: ":7035"
+      ADMIN_HTTP_URL: ":7036"
       S3_ENDPOINT: s3.timeweb.cloud
       S3_ACCESS_KEY_ID: 5CV77KVDUU9H0II9R24M
       S3_SECRET_KEY: 0W0m8DyvdAKRJnsAy6mB5zndQ7RouJBLhqhtThcu
-      JWT_SECRET: $JWT_SECRET
-      HTTP_ADDRESS_USER: ":7035"
-      HTTP_ADDRESS_ADMIN: ":7036"
-      MONGO_HOST: "10.8.0.6"
-      MONGO_PORT: "27017"
-      MONGO_USER: $MONGO_USER
-      MONGO_PASSWORD: $MONGO_PASSWORD
-      MONGO_AUTH: "verification"
-      MONGO_DATABASE_NAME: "verification"
-      CUSTOMER_SVC_ADDRESS: "http://10.8.0.6:9065"
-      STAGING_URL: "https://sadmin.pena"
       S3_FOLDER: verification
       S3_FILE_URL: https://3c580be9-cf31f296-d055-49cf-b39e-30c7959dc17b.s3.timeweb.cloud
+      CUSTOMER_SVC_MICROSERVICE_RPC_URL: "http://10.8.0.6:9065"
+      VERIFICATION_MICROSERVICE_URL: "https://sadmin.pena"
       CUSTOMER_RPC_HOST: 10.8.0.6:9060
-      TRASH_LOG_HOST: 10.8.0.15:7113
+      TRASH_LOG_HOST: trashlog.pena:7113
       MODULE_LOGGER: staging-verification
+      MONGO_URL: mongodb://verification:54143ffdd9304865586e5cf1@10.7.0.6:27017/?authSource=verification
+      MONGO_DB_NAME: verification 
+      JWT_SECRET: >
+        -----BEGIN PUBLIC KEY-----
+        MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCLW1tlHyKC9AG0hGpmkksET2DE
+        r7ojSPemxFWAgFgcPJWQ7x3uNbsdJ3bIZFoA/FClaWKMCZmjnH9tv0bKZtY/CDhM
+        ZEyHpMruRSn6IKrxjtQZWy4uv/w6MzUeyBYG0OvNCiYpdvz5SkAGAUHD5ZNFqn2w
+        KKFD0I2Dr59BFVSGJwIDAQAB
+        -----END PUBLIC KEY-----
 
     tty: true

internal/config/config.go

@@ -18,6 +18,7 @@ type Config struct {
 	S3FileUrl                   string `env:"S3_FILE_URL,required"`
 	CustomerMicroserviceRPCURL  string `env:"CUSTOMER_MICROSERVICE_RPC_URL,required"`
 	TrashLogHost                string `env:"TRASH_LOG_HOST,required"`
+	// TODO: совсем непонятное название. эта штука собой представляет домен, админки стейджинга или прода в зависимости от того, со стейджинга или с прода пришла заявка и нужен только для формирования удобного для админа сообщения в телегу
 	VerificationMicroserviceURL string `env:"VERIFICATION_MICROSERVICE_URL,required"`
 	ExternalCfg                 External
 }