diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml new file mode 100644 index 0000000..35b8c3b --- /dev/null +++ b/.gitea/workflows/deploy.yml @@ -0,0 +1,24 @@ +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 }} + DeployService: + runs-on: [squizstaging] + needs: CreateImage + uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.1.7 + with: + runner: squizstaging diff --git a/.gitea/workflows/lint.yml b/.gitea/workflows/lint.yml index 20e6298..0bd7867 100644 --- a/.gitea/workflows/lint.yml +++ b/.gitea/workflows/lint.yml @@ -9,6 +9,6 @@ on: jobs: Lint: runs-on: [hubstaging] - uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/lint.yml@v1.1.0 + uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/lint.yml@v1.1.2 with: runner: hubstaging diff --git a/deployments/staging/docker-compose.yaml b/deployments/staging/docker-compose.yaml index a18f1c7..b7490c0 100644 --- a/deployments/staging/docker-compose.yaml +++ b/deployments/staging/docker-compose.yaml @@ -1,9 +1,8 @@ -version: "3" services: storerv1.0.0: hostname: squizstorerv1.0.0 container_name: squizstorerv1.0.0 - image: $CI_REGISTRY_IMAGE/staging-storer:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID + image: gitea.pena/squiz/storer/staging:$GITHUB_RUN_NUMBER tty: true labels: com.pena.upload: true @@ -11,11 +10,11 @@ services: environment: IS_PROD_LOG: 'false' IS_PROD: 'false' - PUBLIC_ACCESS_SECRET_KEY: $JWT_PUBLIC_KEY + 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.5 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable' + PG_CRED: 'host=10.7.0.10 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable' ports: - - 10.8.0.5:1589:1489 + - 10.7.0.10:1589:1489 diff --git a/main.go b/main.go index a2f23c8..ed98d78 100644 --- a/main.go +++ b/main.go @@ -3,6 +3,7 @@ package main import ( "github.com/skeris/appInit" "gitea.pena/SQuiz/storer/app" + _ "gitea.pena/PenaSide/linters-golang/pkg/dummy" ) func main() {