diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9db0612..ad1633b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,6 +33,19 @@ migrate-staging: - ls - ./tools/migrate -source file://common/dal/schema -database postgres://squiz:Redalert2@10.8.0.5:5433/squiz?sslmode=disable up +migrate-prod: + stage: migrate + variables: + STAGING_BRANCH: main + tags: + - prod + rules: + - if: "$CI_COMMIT_BRANCH == $STAGING_BRANCH" + script: + - apk add git + - git clone https://buildToken:glpat-axA8ttckx3aPf_xd2Dym@penahub.gitlab.yandexcloud.net/backend/quiz/common.git + - ls + - ./tools/migrate -source file://common/dal/schema -database postgres://squiz:Redalert2@10.8.0.9:5433/squiz?sslmode=disable up deploy-staging: stage: deploy tags: diff --git a/deployments/main/docker-compose.yaml b/deployments/main/docker-compose.yaml index b24522e..cdbcf2f 100644 --- a/deployments/main/docker-compose.yaml +++ b/deployments/main/docker-compose.yaml @@ -1,7 +1,8 @@ +version: "3" services: - worker: - hostname: squiz-worker - container_name: squiz-worker + workerv1.0.0: + hostname: squiz-workerv1.0.0 + container_name: squiz-workerv1.0.0 image: $CI_REGISTRY_IMAGE/main-worker:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID tty: true environment: @@ -23,7 +24,7 @@ services: SMTP_PASS: 'AyMfwqA9LkQH' SMTP_API_KEY: '8tv2xcsfCMBX3TCQxzgeeEwAEYyQrPUp0ggw' SMTP_SENDER: 'recovery@noreply.pena.digital' - CUSTOMER_SERVICE_ADDRESS: 'http://10.8.0.8:8065/' - MINIO_EP: 'storage.yandexcloud.net' - MINIO_AK: 'YCAJEOcqqTHpiwL4qFwLfHPNA' - MINIO_SK: 'YCNIAIat0XqdDzycWsYKX3OU7mPor6S0WmMoG4Ry' + CUSTOMER_SERVICE_ADDRESS: 'http://10.8.0.8:9066/' + MINIO_EP: s3.timeweb.cloud + MINIO_AK: 5CV77KVDUU9H0II9R24M + MINIO_SK: 0W0m8DyvdAKRJnsAy6mB5zndQ7RouJBLhqhtThcu diff --git a/deployments/staging/docker-compose.yaml b/deployments/staging/docker-compose.yaml index 8d55b77..32fdb85 100644 --- a/deployments/staging/docker-compose.yaml +++ b/deployments/staging/docker-compose.yaml @@ -24,7 +24,7 @@ services: SMTP_USERNAME: 'kotilion.95@gmail.com' SMTP_PASSWORD: 'vWwbCSg4bf0p' SMTP_API_KEY: 'P0YsjUB137upXrr1NiJefHmXVKW1hmBWlpev' - CUSTOMER_SERVICE_ADDRESS: '10.8.0.6:8066' + CUSTOMER_SERVICE_ADDRESS: '10.8.0.6:9066' MINIO_EP: s3.timeweb.cloud MINIO_AK: 5CV77KVDUU9H0II9R24M MINIO_SK: 0W0m8DyvdAKRJnsAy6mB5zndQ7RouJBLhqhtThcu diff --git a/go.mod b/go.mod index dde7267..34ef180 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module penahub.gitlab.yandexcloud.net/backend/quiz/worker.git -go 1.21.4 +go 1.22.0 + +toolchain go1.22.2 require ( github.com/go-redis/redis/v8 v8.11.5 @@ -57,4 +59,5 @@ require ( gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240527160654-bd1c2126bc6c // indirect + penahub.gitlab.yandexcloud.net/pena-services/customer v1.0.0 // indirect ) diff --git a/go.sum b/go.sum index e7ad648..b7051ac 100644 --- a/go.sum +++ b/go.sum @@ -157,7 +157,7 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240527160654-bd1c2126bc6c h1:jxnyIeC2CNDNmfdFx2qnLS4Qd0v5ocYrY9X+OL9qsvc= penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240527160654-bd1c2126bc6c/go.mod h1:lTmpjry+8evVkXWbEC+WMOELcFkRD1lFMc7J09mOndM= -penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240617151847-e1322a679dd1 h1:KCQf7PmSq63YemEF5s81f7lXsewWFQjIr0IeIWxzBVo= -penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240617151847-e1322a679dd1/go.mod h1:n66zm88Dh12+idyfqh0vU5nd9BZYxM6Pv0XYnmy0398= penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240617173955-a34278088ddd h1:/FW9GjEbxXWD5/e3oUGn4iKihhc77FvfDPnVqL1SQvM= penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240617173955-a34278088ddd/go.mod h1:n66zm88Dh12+idyfqh0vU5nd9BZYxM6Pv0XYnmy0398= +penahub.gitlab.yandexcloud.net/pena-services/customer v1.0.0 h1:PkXvLTnVgnch+O81wWU0ayLe6CfccP/wKgOCu/xc9sc= +penahub.gitlab.yandexcloud.net/pena-services/customer v1.0.0/go.mod h1:fKiHnVzo7ScG4LNQABOxe7EdAfyu6RpkpAIXBx2I19k=