diff --git a/.gitea/workflows/deployStaging.yml b/.gitea/workflows/deployStaging.yml index d497c68..5db9a4b 100644 --- a/.gitea/workflows/deployStaging.yml +++ b/.gitea/workflows/deployStaging.yml @@ -15,9 +15,28 @@ jobs: secrets: REGISTRY_USER: ${{ secrets.REGISTRY_USER }} REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} + ValidateConfig: + runs-on: [squizstaging] + uses: https://gitea.pena/PenaDevops/actions.git/.gitea/workflows/validate_config.yml@v1.2.1 + needs: CreateImage + with: + runner: hubstaging + secrets: + REGISTRY_USER: ${{ secrets.REGISTRY_USER }} + REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} + MigrateDatabase: + runs-on: [squizstaging] + uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/migrate.yml@9263e22095fa40bcb36881ad81722d3049acd07f + needs: ValidateConfig + with: + runner: hubstaging + branch_name: ${{ github.ref_name }} + secrets: + REGISTRY_USER: ${{ secrets.REGISTRY_USER }} + REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} DeployService: runs-on: [squizstaging] - needs: CreateImage + needs: MigrateDatabase uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.1.4-p7 with: runner: squizstaging diff --git a/Dockerfile b/Dockerfile index cb1e87a..8e9cf91 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,9 @@ WORKDIR /app COPY . . RUN go mod download RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o wrkr ./cmd/main.go +RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o validator ./cmd/validator/main.go FROM gitea.pena/penadevops/container-images/alpine:main as prod +COPY --from=build /app/validator . COPY --from=build /app/wrkr . CMD ["/wrkr"] diff --git a/deployments/staging/config.env b/deployments/staging/config.env new file mode 100644 index 0000000..53b0077 --- /dev/null +++ b/deployments/staging/config.env @@ -0,0 +1,22 @@ +IS_PROD_LOG="false" +IS_PROD='false' +POSTGRES_URL='host=10.7.0.10 port=5432 user=squiz password=Redalert2 dbname=squiz sslmode=disable' +KAFKA_BROKERS= '10.7.0.6:9092' +KAFKA_TOPIC= 'tariffs' +QUIZ_ID=quizCnt +AMOUNT=10 +UNLIM_ID=quizUnlimTime +REDIS_HOST='10.7.0.10:6379' +REDIS_PASSWORD='Redalert2' +REDIS_DB=2 +MAIL_SENDER='noreply@mailing.pena.digital' +MAIL_API_KEY='P0YsjUB137upXrr1NiJefHmXVKW1hmBWlpev' +CUSTOMER_MICROSERVICE_RPC_URL='10.7.0.6:9060' +S3_ENDPOINT=s3.timeweb.cloud +S3_ACCESS_KEY=5CV77KVDUU9H0II9R24M +S3_SECRET_KEY=0W0m8DyvdAKRJnsAy6mB5zndQ7RouJBLhqhtThcu +KAFKA_TOPIC_GIGA_CHAT=gigachat +KAFKA_GROUP_GIGA_CHAT="" +GIGA_CHAT_API_AUTH_KEY=Y2MzZWUxZDMtZGE5MC00ZTFjLWI5YzItM2ViMTZmMDM0YTkwOmY1NTlkOGM3LWUyNmQtNGUwMC1hODE0LTJlYjQ5NDA5ODdjMQ== +GIGA_CHAT_API_BASE_URL="https://gigachat.devices.sberbank.ru/api/v1" +TELEGRAM_TOKEN=6112841016:AAH2nO1c6mqfMewBvHwdXCDp5PCclOuc99 diff --git a/deployments/staging/docker-compose.yaml b/deployments/staging/docker-compose.yaml index 6b2a3e5..2263b2b 100644 --- a/deployments/staging/docker-compose.yaml +++ b/deployments/staging/docker-compose.yaml @@ -4,25 +4,7 @@ services: container_name: squiz-workerv1.0.0 image: gitea.pena/squiz/worker/staging:$GITHUB_RUN_NUMBER tty: true - environment: - IS_PROD_LOG: 'false' - IS_PROD: 'false' - POSTGRES_URL: 'host=10.7.0.10 port=5432 user=squiz password=Redalert2 dbname=squiz sslmode=disable' - KAFKA_BROKERS: '10.7.0.6:9092' - KAFKA_TOPIC: 'tariffs' - QUIZ_ID: quizCnt - AMOUNT: 10 - UNLIM_ID: quizUnlimTime - REDIS_HOST: '10.7.0.10:6379' - REDIS_PASSWORD: 'Redalert2' - REDIS_DB: 2 - MAIL_SENDER: 'noreply@mailing.pena.digital' - MAIL_API_KEY: 'P0YsjUB137upXrr1NiJefHmXVKW1hmBWlpev' - CUSTOMER_MICROSERVICE_RPC_URL: '10.7.0.6:9060' - S3_ENDPOINT: s3.timeweb.cloud - S3_ACCESS_KEY: 5CV77KVDUU9H0II9R24M - S3_SECRET_KEY: 0W0m8DyvdAKRJnsAy6mB5zndQ7RouJBLhqhtThcu - KAFKA_TOPIC_GIGA_CHAT: gigachat - KAFKA_GROUP_GIGA_CHAT: "" - GIGA_CHAT_API_AUTH_KEY: Y2MzZWUxZDMtZGE5MC00ZTFjLWI5YzItM2ViMTZmMDM0YTkwOmY1NTlkOGM3LWUyNmQtNGUwMC1hODE0LTJlYjQ5NDA5ODdjMQ== - GIGA_CHAT_API_BASE_URL: "https://gigachat.devices.sberbank.ru/api/v1" + env_file: config.env + ports: + - 10.7.0.10:2347:2345 + command: dlv --listen=:2345 --continue --headless=true --log=true --log-output=debugger,debuglineerr,gdbwire,lldbout,rpc --accept-multiclient --api-version=2 exec /wrkr diff --git a/deployments/staging/validate_config.yml b/deployments/staging/validate_config.yml new file mode 100644 index 0000000..6c53be9 --- /dev/null +++ b/deployments/staging/validate_config.yml @@ -0,0 +1,6 @@ +services: + validator: + tty: true + command: ./validator + image: gitea.pena/squiz/worker/staging:$GITHUB_RUN_NUMBER + env_file: config.env diff --git a/go.mod b/go.mod index 33e9577..1fa7b84 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23.2 toolchain go1.23.4 require ( - gitea.pena/PenaSide/common v0.0.0-20250103085335-91ea31fee517 + gitea.pena/PenaSide/common v0.0.0-20250421103113-7e4b3ae9e1e0 gitea.pena/PenaSide/customer v0.0.0-20250407185330-82e95e8da043 gitea.pena/PenaSide/hlog v0.0.0-20241125221102-a54c29c002a9 gitea.pena/SQuiz/common v0.0.0-20250514124515-870e52266ca5 diff --git a/go.sum b/go.sum index b64dafe..b85152d 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ gitea.pena/PenaSide/common v0.0.0-20250103085335-91ea31fee517 h1:EgBe8VcdPwmxbSzYLndncP+NmR73uYuXxkTeDlEttEE= gitea.pena/PenaSide/common v0.0.0-20250103085335-91ea31fee517/go.mod h1:91EuBCgcqgJ6mG36n2pds8sPwwfaJytLWOzY3h2YFKU= +gitea.pena/PenaSide/common v0.0.0-20250421103113-7e4b3ae9e1e0 h1:+gvpAPo1+1WtCpA+QaCWNy4R9/cIERBBzrVSYrx7hNo= +gitea.pena/PenaSide/common v0.0.0-20250421103113-7e4b3ae9e1e0/go.mod h1:91EuBCgcqgJ6mG36n2pds8sPwwfaJytLWOzY3h2YFKU= gitea.pena/PenaSide/customer v0.0.0-20250407185330-82e95e8da043 h1:a/89TC0bRdWRjS875EIE1c1ZPgmRcDaKMcQoUv+sg+I= gitea.pena/PenaSide/customer v0.0.0-20250407185330-82e95e8da043/go.mod h1:DDg6CQDhU+aSSTv8R/LbkNGegdCx+Q++DcgPfE2LbZU= gitea.pena/PenaSide/hlog v0.0.0-20241125221102-a54c29c002a9 h1:tBkXWNIt8icmkMMnq8MA421RWkUy4OZh5P7C3q8uCu4=