From 09e9ea3661fbe6337ee49753a8349d7a7df08c88 Mon Sep 17 00:00:00 2001 From: Pasha Date: Thu, 12 Dec 2024 18:32:05 +0300 Subject: [PATCH] return state --- .gitea/workflows/deploy.yml | 44 ++++++++++++------------- cmd/validator/main.go | 11 ------- deployments/staging/docker-compose.yaml | 8 +---- 3 files changed, 23 insertions(+), 40 deletions(-) delete mode 100644 cmd/validator/main.go diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 7598f18..85bb14b 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -8,28 +8,28 @@ on: - 'staging' jobs: - Validate: - runs-on: [hubstaging] - steps: - - name: Check out repository code - uses: http://gitea.pena:3000/PenaDevops/actions.git/checkout@v1 - - - name: Setup Go - uses: actions/setup-go@v3 - with: - go-version: '1.23' - - - name: Run Validator - run: | - cd cmd/validator - go build -o validator . - ./validator - # ошибка если возникла то прервать пайплайн - env: - MONGO_HOST: ${{ secrets.BB_MONGO_URI }} +# Validate: +# runs-on: [hubstaging] +# steps: +# - name: Check out repository code +# uses: http://gitea.pena:3000/PenaDevops/actions.git/checkout@v1 +# +# - name: Setup Go +# uses: actions/setup-go@v3 +# with: +# go-version: '1.23' +# +# - name: Run Validator +# run: | +# cd cmd/validator +# go build -o validator . +# ./validator +# # ошибка если возникла то прервать пайплайн +# env: +# MONGO_HOST: ${{ secrets.BB_MONGO_URI }} CreateImage: runs-on: [hubstaging] - needs: Validate +# needs: Validate uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/build-image.yml@v1.1.4-p7 with: runner: hubstaging @@ -38,8 +38,8 @@ jobs: REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} DeployService: runs-on: [hubstaging] - needs: [Validate,CreateImage] -# needs: [CreateImage] +# needs: [Validate,CreateImage] + needs: [CreateImage] uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.1.3 with: runner: hubstaging diff --git a/cmd/validator/main.go b/cmd/validator/main.go deleted file mode 100644 index f6ccd35..0000000 --- a/cmd/validator/main.go +++ /dev/null @@ -1,11 +0,0 @@ -package main - -import ( - "fmt" - "log" -) - -func main() { - fmt.Println("Hello World") - log.Fatal("CHECK WORKFLOW") -} diff --git a/deployments/staging/docker-compose.yaml b/deployments/staging/docker-compose.yaml index 49d6ca7..e9c2954 100644 --- a/deployments/staging/docker-compose.yaml +++ b/deployments/staging/docker-compose.yaml @@ -25,13 +25,7 @@ services: MONGO_AUTH: support BB_MONGO_URI: "mongodb://support:54143ffdd9304865586e5cf2@mongodb.pena/?authSource=support" S3_REGION: ru-1 - JWT_SECRET: > - -----BEGIN PUBLIC KEY----- - MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCLW1tlHyKC9AG0hGpmkksET2DE - r7ojSPemxFWAgFgcPJWQ7x3uNbsdJ3bIZFoA/FClaWKMCZmjnH9tv0bKZtY/CDhM - ZEyHpMruRSn6IKrxjtQZWy4uv/w6MzUeyBYG0OvNCiYpdvz5SkAGAUHD5ZNFqn2w - KKFD0I2Dr59BFVSGJwIDAQAB - -----END PUBLIC KEY----- + JWT_SECRET: "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCLW1tlHyKC9AG0hGpmkksET2DE\nr7ojSPemxFWAgFgcPJWQ7x3uNbsdJ3bIZFoA/FClaWKMCZmjnH9tv0bKZtY/CDhM\nZEyHpMruRSn6IKrxjtQZWy4uv/w6MzUeyBYG0OvNCiYpdvz5SkAGAUHD5ZNFqn2w\nKKFD0I2Dr59BFVSGJwIDAQAB\n-----END PUBLIC KEY-----" TELEGRAM_TOKEN: "6414077478:AAFk03HezovLT2kO_i9OYswH8Weirsgp9GU" TELEGRAM_CHAT_ID: 1002089014760 REDIS_HOST: "10.7.0.6:6379"