Commit 983e95e6 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master'

Dev

See merge request redmic-project/log/fluent-bit!5
parents 39e75ba8 d71e34dc
Loading
Loading
Loading
Loading

.gitignore

deleted100644 → 0
+0 −0

Empty file deleted.

+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}

LICENSE

0 → 100644
+21 −0
Original line number Diff line number Diff line
MIT License

Copyright (c) 2020 REDMIC Project / Log

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+1 −0
Original line number Diff line number Diff line
version: '3.5'
+1 −0
Original line number Diff line number Diff line
version: '3.5'
Loading