Commit e6ffbb19 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Actualiza detalles de CI y deploy

See merge request redmic-project/certificates-manager!8
parents 55312822 c79e5d31

.gitlab-ci.yml

+5 −22
Original line number Diff line number Diff line 
image: docker:stable



stages:

  - deploy

  - maintenance



image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest



variables:

  DOCKER_DRIVER: overlay2

  STACK: ${CI_PROJECT_NAME}

  SERVICES_TO_CHECK: ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}

  STATUS_CHECK_DELAY: 10



services:

  - docker:dind



deploy-supporting-branch-develop:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: ${CI_PROJECT_NAME}

    SERVICES_TO_CHECK: ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}

    STATUS_CHECK_DELAY: 10

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    CERT_NAME: ${DEV_CERT_NAME}

    DOMAIN_LIST: ${DEV_DOMAIN_LIST}
@@ -37,12 +36,8 @@ deploy-supporting-branch-develop: 


deploy-stable-branch-develop:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: ${CI_PROJECT_NAME}

    SERVICES_TO_CHECK: ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}

    STATUS_CHECK_DELAY: 10

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    CERT_NAME: ${DEV_CERT_NAME}

    DOMAIN_LIST: ${DEV_DOMAIN_LIST}
@@ -61,12 +56,8 @@ deploy-stable-branch-develop: 


deploy-supporting-branch-production:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STACK: ${CI_PROJECT_NAME}

    SERVICES_TO_CHECK: ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}

    STATUS_CHECK_DELAY: 10

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

    CERT_NAME: ${PRO_CERT_NAME}

    DOMAIN_LIST: ${PRO_DOMAIN_LIST}
@@ -86,12 +77,8 @@ deploy-supporting-branch-production: 


deploy-stable-branch-production:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STACK: ${CI_PROJECT_NAME}

    SERVICES_TO_CHECK: ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}

    STATUS_CHECK_DELAY: 10

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

    CERT_NAME: ${PRO_CERT_NAME}

    DOMAIN_LIST: ${PRO_DOMAIN_LIST}
@@ -110,20 +97,16 @@ deploy-stable-branch-production: 


scheduled-renew-develop:

  stage: maintenance

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}

  script: relaunch.sh

  only:

    - schedules



scheduled-renew-production:

  stage: maintenance

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}

  script: relaunch.sh

  only:

    - schedules

deploy/docker-compose.tmpl.yml

+7 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ services: 
      - metric-net

    volumes:

      - config-vol:/certs

      - lib-vol:/var/lib/docker

      - /var/run/docker.sock:/var/run/docker.sock

    configs:

      - source: manage-certificates
@@ -33,10 +34,11 @@ services: 
          cpus: '0.5'

          memory: 64M

        reservations:

          memory: 52M

          memory: 16M



networks:

  metric-net:

    name: ${METRIC_NET_NAME:-metric-net}

    external: true



volumes:
@@ -49,6 +51,10 @@ volumes: 
  logs-vol:

    name: ${CERTBOT_LOGS_VOL_NAME}



  lib-vol:

    name: ${CERTIFICATES_MANAGER_LIB_VOL_NAME:-certificates-manager-lib-vol}



configs:

  manage-certificates:

    name: ${MANAGE_CERTIFICATES_NAME:-manage-certificates}

    file: ./scripts/manage-certificates.sh