diff --git a/.gitea/workflows/deployProd.yml b/.gitea/workflows/deployProd.yml new file mode 100644 index 0000000..29e65fc --- /dev/null +++ b/.gitea/workflows/deployProd.yml @@ -0,0 +1,17 @@ +name: Deploy +run-name: ${{ gitea.actor }} build image and push to container registry + +on: + push: + branches: + - 'main' + +jobs: + DeployService: + runs-on: [frontprod] + uses: https://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.1.4-p7 + with: + runner: hubprod + actionid: ${{ gitea.run_id }} + + diff --git a/.gitea/workflows/deployStaging.yml b/.gitea/workflows/deployStaging.yml new file mode 100644 index 0000000..3495235 --- /dev/null +++ b/.gitea/workflows/deployStaging.yml @@ -0,0 +1,26 @@ +name: Deploy +run-name: ${{ gitea.actor }} build image and push to container registry + +on: + push: + branches: + - 'staging' + +jobs: + CreateImage: + runs-on: [hubstaging] + 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: [frontstaging] + needs: CreateImage + uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.1.4-p7 + with: + runner: frontstaging + actionid: ${{ gitea.run_id }} + + diff --git a/.gitea/workflows/lint.yml b/.gitea/workflows/lint.yml new file mode 100644 index 0000000..20e6298 --- /dev/null +++ b/.gitea/workflows/lint.yml @@ -0,0 +1,14 @@ +name: Lint +run-name: ${{ gitea.actor }} produce linting + +on: + push: + branches: + - 'dev' + +jobs: + Lint: + runs-on: [hubstaging] + uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/lint.yml@v1.1.0 + with: + runner: hubstaging diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 454498b..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,21 +0,0 @@ -include: - - project: "devops/pena-continuous-integration" - file: "/templates/docker/deploy-template.gitlab-ci.yml" -stages: - - deploy -deploy-to-prod: - tags: - - prod - - front - extends: .deploy_template - variables: - PRODUCTION_BRANCH: main - before_script: - - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - after_script: - - ls - rules: - - if: "$CI_COMMIT_BRANCH == $PRODUCTION_BRANCH" - script: - - docker login -u $REGISTRY_USER -p $REGISTRY_TOKEN $CI_REGISTRY - - docker-compose -f deployments/$CI_COMMIT_BRANCH/docker-compose.yaml up -d diff --git a/deployments/main/docker-compose.yaml b/deployments/main/docker-compose.yaml index 50eecf0..f18ac77 100644 --- a/deployments/main/docker-compose.yaml +++ b/deployments/main/docker-compose.yaml @@ -1,8 +1,7 @@ -version: '3' services: certbot: image: certbot/certbot:latest command: certonly -n -m kotilion.95@gmail.com --expand --agree-tos -v --webroot --webroot-path /var/www/certbot/ -d pena.digital,www.pena.digital,hub.pena.digital,docs.pena.digital,quiz.pena.digital,oauth.pena.digital,links.pena.digital,metrica.pena.digital,hbpn.link,solyanka.pena.digital,tourism.pena.digital,penaquiz.online,www.penaquiz.online,penaquiz.ru,www.penaquiz.ru volumes: - - /builds/frontend/nginx-proxy/deployments/main/certbot/www/:/var/www/certbot/:rw - - /builds/frontend/nginx-proxy/deployments/main/nginx/certs/:/etc/letsencrypt/:rw + - ./acme/:/var/www/certbot/:rw + - ./certs/:/etc/letsencrypt/:rw