Commit 4d21fa59 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Renombra jobs de deploy para aclarar su función

See merge request redmic-project/certificates-manager!3
parents 5e896745 30bd577f

.gitlab-ci.yml

+21 −21
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ variables: 
services:

  - docker:dind



deploy-dev-develop:

deploy-supporting-branch-develop:

  stage: deploy

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

  variables:
@@ -35,56 +35,56 @@ deploy-dev-develop: 
    - schedules

  when: manual



deploy-dev-production:

deploy-stable-branch-develop:

  stage: deploy

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

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    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.prod.yml

    CERT_NAME: ${PRO_CERT_NAME}

    DOMAIN_LIST: ${PRO_DOMAIN_LIST}

    EMAIL_LIST: ${PRO_EMAIL_LIST}

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

    CERT_NAME: ${DEV_CERT_NAME}

    DOMAIN_LIST: ${DEV_DOMAIN_LIST}

    EMAIL_LIST: ${DEV_EMAIL_LIST}

  script:

    - >

      deploy.sh COMPOSE_FILE=${COMPOSE_FILE} CERT_NAME=${CERT_NAME} DOMAIN_LIST=${DOMAIN_LIST}

      EMAIL_LIST=${EMAIL_LIST}

  environment:

    name: pro

    name: dev

  only:

    - branches

  except:

    - master

  except:

    - schedules

  when: manual



deploy-pro-develop:

deploy-supporting-branch-production:

  stage: deploy

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

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    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.dev.yml

    CERT_NAME: ${DEV_CERT_NAME}

    DOMAIN_LIST: ${DEV_DOMAIN_LIST}

    EMAIL_LIST: ${DEV_EMAIL_LIST}

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

    CERT_NAME: ${PRO_CERT_NAME}

    DOMAIN_LIST: ${PRO_DOMAIN_LIST}

    EMAIL_LIST: ${PRO_EMAIL_LIST}

  script:

    - >

      deploy.sh COMPOSE_FILE=${COMPOSE_FILE} CERT_NAME=${CERT_NAME} DOMAIN_LIST=${DOMAIN_LIST}

      EMAIL_LIST=${EMAIL_LIST}

  environment:

    name: dev

    name: pro

  only:

    - master

    - branches

  except:

    - master

    - schedules

  when: manual



deploy-pro-production:

deploy-stable-branch-production:

  stage: deploy

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

  variables:
@@ -108,7 +108,7 @@ deploy-pro-production: 
    - schedules

  when: manual



scheduled-renew-dev:

scheduled-renew-develop:

  stage: maintenance

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

  variables:
@@ -118,7 +118,7 @@ scheduled-renew-dev: 
  only:

    - schedules



scheduled-renew-pro:

scheduled-renew-production:

  stage: maintenance

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

  variables: