diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml deleted file mode 100644 index 8df76e6..0000000 --- a/.gitea/workflows/deploy.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Deploy -run-name: ${{ gitea.actor }} build image and push to container registry - -on: - push: - branches: - - 'main' - - 'staging' - -jobs: - - CreateImage: - runs-on: [squizstaging] - uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/build-image.yml@v1.1.6-p - with: - runner: squizstaging - secrets: - REGISTRY_USER: ${{ secrets.REGISTRY_USER }} - REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} - ValidateConfig: - runs-on: [squizstaging] - needs: CreateImage - container: - image: gitea.pena/penadevops/container-images/node-compose:main - volumes: - - /run/user/1000/podman/podman.sock:/run/user/1000/podman/podman.sock - steps: - - name: Check out repository code - uses: https://gitea.pena/PenaDevops/actions.git/checkout@v1 - - name: Run validator - run: GITHUB_RUN_NUMBER=${{ gitea.run_id }} compose -f deployments/${{ gitea.ref_name }}/validate_config.yml up - DeployService: - runs-on: [squizstaging] - needs: ValidateConfig - uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.1.7 - with: - runner: squizstaging diff --git a/.gitea/workflows/deployProd.yml b/.gitea/workflows/deployProd.yml index d2d57e8..c0c0f0b 100644 --- a/.gitea/workflows/deployProd.yml +++ b/.gitea/workflows/deployProd.yml @@ -15,9 +15,18 @@ 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@main + needs: CreateImage + with: + runner: hubstaging + secrets: + REGISTRY_USER: ${{ secrets.REGISTRY_USER }} + REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} DeployService: runs-on: [squizprod] - needs: CreateImage + needs: ValidateConfig uses: https://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.1.4-p7 with: runner: hubprod diff --git a/.gitea/workflows/deployStaging.yml b/.gitea/workflows/deployStaging.yml index a9c04e4..b43b189 100644 --- a/.gitea/workflows/deployStaging.yml +++ b/.gitea/workflows/deployStaging.yml @@ -8,16 +8,25 @@ on: jobs: CreateImage: - runs-on: [hubstaging] + runs-on: [squizstaging] uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/build-image.yml@v1.1.6-p with: runner: hubstaging secrets: REGISTRY_USER: ${{ secrets.REGISTRY_USER }} REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} - DeployService: - runs-on: [hubstaging] + ValidateConfig: + runs-on: [squizstaging] + uses: https://gitea.pena/PenaDevops/actions.git/.gitea/workflows/validate_config.yml@main needs: CreateImage + with: + runner: hubstaging + secrets: + REGISTRY_USER: ${{ secrets.REGISTRY_USER }} + REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} + DeployService: + runs-on: [squizstaging] + needs: ValidateConfig uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.1.4-p7 with: runner: hubstaging diff --git a/.gitignore b/.gitignore index 1ffb511..78414b6 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,5 @@ squiz gen worker/worker storer/storer -answerer/answerer \ No newline at end of file +answerer/answerer +./main diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index e69de29..0000000 diff --git a/Taskfile.dist.yml b/Taskfile.dist.yml index c96d07c..73a0e2e 100644 --- a/Taskfile.dist.yml +++ b/Taskfile.dist.yml @@ -3,8 +3,8 @@ version: "3" tasks: update-linter: cmds: - - go get -u penahub.gitlab.yandexcloud.net/devops/linters/golang.git + - go get -u gitea.pena/PenaSide/linters-golang/pkg/dummy lint: cmds: - task: update-linter - - cmd: golangci-lint run -v -c $(go list -f '{{"{{"}}.Dir{{"}}"}}' -m penahub.gitlab.yandexcloud.net/devops/linters/golang.git)/.golangci.yml + - cmd: golangci-lint run -v -c $(go list -f '{{"{{"}}.Dir{{"}}"}}' -m gitea.pena/PenaSide/linters-golang/pkg/dummy)/.golangci.yml diff --git a/cmd/main.go b/cmd/main.go index bab51f5..bb99949 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -8,6 +8,7 @@ import ( "log" "os/signal" "syscall" + _ "gitea.pena/PenaSide/linters-golang/pkg/dummy" ) func main() { diff --git a/deployments/Containerfile b/deployments/Containerfile deleted file mode 100644 index 676d5ae..0000000 --- a/deployments/Containerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM gitea.pena/penadevops/container-images/golang:main -COPY . . diff --git a/deployments/main/config.env b/deployments/main/config.env new file mode 100644 index 0000000..621f9a0 --- /dev/null +++ b/deployments/main/config.env @@ -0,0 +1,13 @@ +IS_PROD_LOG=false +IS_PROD=false +PUBLIC_ACCESS_SECRET_KEY="-----BEGIN PUBLIC KEY----- +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCLW1tlHyKC9AG0hGpmkksET2DE +r7ojSPemxFWAgFgcPJWQ7x3uNbsdJ3bIZFoA/FClaWKMCZmjnH9tv0bKZtY/CDhM +ZEyHpMruRSn6IKrxjtQZWy4uv/w6MzUeyBYG0OvNCiYpdvz5SkAGAUHD5ZNFqn2w +KKFD0I2Dr59BFVSGJwIDAQAB +-----END PUBLIC KEY-----" +PORT=1489 +S3_ENDPOINT=s3.timeweb.cloud +S3_ACCESS_KEY=5CV77KVDUU9H0II9R24M +S3_SECRET_KEY=0W0m8DyvdAKRJnsAy6mB5zndQ7RouJBLhqhtThcu +POSTGRES_URL="host=10.8.0.12 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable" diff --git a/deployments/main/docker-compose.yaml b/deployments/main/docker-compose.yaml index b24e093..ff9e634 100644 --- a/deployments/main/docker-compose.yaml +++ b/deployments/main/docker-compose.yaml @@ -2,14 +2,6 @@ services: storerv1.0.0: image: gitea.pena/squiz/storer/main:$GITHUB_RUN_NUMBER tty: true - environment: - IS_PROD_LOG: 'false' - IS_PROD: 'false' - PUBLIC_ACCESS_SECRET_KEY: "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCLW1tlHyKC9AG0hGpmkksET2DE\nr7ojSPemxFWAgFgcPJWQ7x3uNbsdJ3bIZFoA/FClaWKMCZmjnH9tv0bKZtY/CDhM\nZEyHpMruRSn6IKrxjtQZWy4uv/w6MzUeyBYG0OvNCiYpdvz5SkAGAUHD5ZNFqn2w\nKKFD0I2Dr59BFVSGJwIDAQAB\n-----END PUBLIC KEY-----" - PORT: 1489 - MINIO_EP: s3.timeweb.cloud - MINIO_AK: 5CV77KVDUU9H0II9R24M - MINIO_SK: 0W0m8DyvdAKRJnsAy6mB5zndQ7RouJBLhqhtThcu - PG_CRED: 'host=10.8.0.12 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable' + env_file: config.env ports: - 10.8.0.12:1589:1489 diff --git a/deployments/main/staging/docker-compose.yaml b/deployments/main/staging/docker-compose.yaml deleted file mode 100644 index b07301c..0000000 --- a/deployments/main/staging/docker-compose.yaml +++ /dev/null @@ -1,17 +0,0 @@ -services: - storer: - hostname: squiz-storer - container_name: squiz-storer - image: $CI_REGISTRY_IMAGE/storer:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID - tty: true - environment: - IS_PROD_LOG: 'false' - IS_PROD: 'false' - PUBLIC_ACCESS_SECRET_KEY: $JWT_PUBLIC_KEY - PORT: 1489 - MINIO_EP: 'storage.yandexcloud.net' - MINIO_AK: 'YCAJEOcqqTHpiwL4qFwLfHPNA' - MINIO_SK: 'YCNIAIat0XqdDzycWsYKX3OU7mPor6S0WmMoG4Ry' - PG_CRED: 'host=10.6.0.23 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable' - ports: - - 1489:1489 diff --git a/deployments/main/validate_config.yml b/deployments/main/validate_config.yml new file mode 100644 index 0000000..a7b9fff --- /dev/null +++ b/deployments/main/validate_config.yml @@ -0,0 +1,7 @@ +services: + storervalidate: + tty: true + command: ./validator + image: gitea.pena/squiz/storer/main:$GITHUB_RUN_NUMBER + + env_file: config.env diff --git a/go.mod b/go.mod index 9013361..d491f70 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,7 @@ go 1.23.2 require ( gitea.pena/PenaSide/common v0.0.0-20250103085335-91ea31fee517 + gitea.pena/PenaSide/linters-golang v0.0.0-20241207122018-933207374735 gitea.pena/SQuiz/common v0.0.0-20250221135056-f98c45e04909 github.com/caarlos0/env/v8 v8.0.0 github.com/gofiber/fiber/v2 v2.52.4 diff --git a/go.sum b/go.sum index c01df52..f861099 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/linters-golang v0.0.0-20241207122018-933207374735 h1:jDVeUhGBTXBibmW5dmtJg2m2+z5z2Rf6J4G0LpjVoJ0= +gitea.pena/PenaSide/linters-golang v0.0.0-20241207122018-933207374735/go.mod h1:gdd+vOT6up9STkEbxa2qESLIMZFjCmRbkcheFQCVgZU= gitea.pena/SQuiz/common v0.0.0-20250221135056-f98c45e04909 h1:iCiqaJ6a7rGESAEUgtVA9IqhVn0oKiwRk7bryTWPV5w= gitea.pena/SQuiz/common v0.0.0-20250221135056-f98c45e04909/go.mod h1:rQRjqLlLyM71FZcvbM95Nv3ciq44F9DFtUHPZmDK3T8= github.com/ClickHouse/clickhouse-go v1.5.4 h1:cKjXeYLNWVJIx2J1K6H2CqyRmfwVJVY1OV1coaaFcI0= diff --git a/main b/main new file mode 100755 index 0000000..ab77ad7 Binary files /dev/null and b/main differ