Commit 2c5be386 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Actualiza config de despliegue

parent b7a32f4a

.gitignore

deleted100644 → 0
+0 −0

Empty file deleted.

.gitlab-ci.yml

+9 −59
Original line number Diff line number Diff line 
include:

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment.yml'



stages:

  - deploy



image: ${DOCKER_DEPLOY_IMAGE_NAME}:${DOCKER_DEPLOY_IMAGE_TAG}



variables:

  DOCKER_DRIVER: overlay2

  STACK: log

  SERVICES_TO_CHECK: log_${CI_PROJECT_NAME}

  IMAGE_TAG: latest



services:

  - docker:dind



deploy-supporting-branch-develop:

  stage: deploy

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG}

  environment:

    name: dev

  only:

    - branches

  except:

    - master

  when: manual



deploy-stable-branch-develop:

  stage: deploy

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG}

  environment:

    name: dev

  only:

    - master

  when: manual



deploy-supporting-branch-production:

  stage: deploy

variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG}

  environment:

    name: pro

  only:

    - branches

  except:

    - master

  when: manual

  PROJECT_PARENT_NAME: log



deploy-stable-branch-production:

  stage: deploy

.deploy:

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG}

  environment:

    name: pro

  only:

    - master

  when: manual
 
    STACK: ${PROJECT_PARENT_NAME}

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}

deploy/docker-compose.dev.yml

0 → 100644
+1 −0
Original line number Diff line number Diff line 
version: '3.5'

deploy/docker-compose.prod.yml

0 → 100644
+1 −0
Original line number Diff line number Diff line 
version: '3.5'

deploy/docker-compose.yml→deploy/docker-compose.tmpl.yml

+8 −6
Original line number Diff line number Diff line
@@ -17,19 +17,21 @@ services: 
    deploy:

      mode: global

      restart_policy:

        delay: 5s

        window: 30s

        delay: ${RESTART_DELAY:-1s}

      update_config:

        delay: ${UPDATE_DELAY:-10s}

      resources:

        limits:

          cpus: '0.01'

          memory: 64M

          cpus: '${RESOURCES_LIMITS_CPUS:-0.1}'

          memory: ${RESOURCES_LIMITS_MEMORY:-64M}

        reservations:

          memory: 16M

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-16M}



networks:

  log-net:

    name: ${LOG_NET_NAME:-log-net}

    driver: overlay

    driver: ${LOG_NET_DRIVER:-overlay}

    attachable: ${LOG_NET_ATTACHABLE:-true}



configs:

README.md

+1 −1

File changed.

Contains only whitespace changes.