Commit 034f4589 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Oculta de verdad programados de pipes de master

See merge request redmic-project/elastic/curator!2
parents 60e16582 3637b244

.gitlab-ci.yml

+18 −20
Original line number Diff line number Diff line
@@ -120,26 +120,24 @@ scheduled-deploy-curator-stable-branch-develop: 
  environment:

    name: dev

  only:

    - master

    - schedules

  when: manual



scheduled-deploy-curator-stable-branch-production:

  stage: deploy

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

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

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

    ELASTICSEARCH_URL: ${PRO_ELASTICSEARCH_URL}

    ELASTICSEARCH_AUTH: ${PRO_ELASTICSEARCH_USERNAME}:${PRO_ELASTICSEARCH_PASSWORD}

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      ELASTICSEARCH_URL=${ELASTICSEARCH_URL} ELASTICSEARCH_AUTH=${ELASTICSEARCH_AUTH}

      DELETE_OLD_LOGS_DISABLE=${DELETE_OLD_LOGS_DISABLE:-True}

  environment:

    name: pro

  only:

    - master

    - schedules

  when: manual
 
#scheduled-deploy-curator-stable-branch-production:

#  stage: deploy

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

#  variables:

#    SSH_REMOTE: ${PRO_SSH_REMOTE}

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

#    ELASTICSEARCH_URL: ${PRO_ELASTICSEARCH_URL}

#    ELASTICSEARCH_AUTH: ${PRO_ELASTICSEARCH_USERNAME}:${PRO_ELASTICSEARCH_PASSWORD}

#  script:

#    - >

#      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

#      ELASTICSEARCH_URL=${ELASTICSEARCH_URL} ELASTICSEARCH_AUTH=${ELASTICSEARCH_AUTH}

#      DELETE_OLD_LOGS_DISABLE=${DELETE_OLD_LOGS_DISABLE:-True}

#  environment:

#    name: pro

#  only:

#    - schedules

#  when: manual