From 4c730b8af2a5d59a9656376c97c7199519a81e00 Mon Sep 17 00:00:00 2001 From: skeris Date: Tue, 3 Jun 2025 23:57:07 +0300 Subject: [PATCH] ci: add db migration and config validation to pipeline --- .gitea/workflows/deployStaging.yml | 21 +++++++++++++++++++- Dockerfile | 2 ++ deployments/staging/config.env | 22 +++++++++++++++++++++ deployments/staging/docker-compose.yaml | 26 ++++--------------------- 4 files changed, 48 insertions(+), 23 deletions(-) create mode 100644 deployments/staging/config.env 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..ed8673a --- /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" + 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