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

Merge branch 'dev' into 'master' 

Actualiza deploy y limita recursos

See merge request redmic-project/gis/sftp!8
parents 550b4107 630baf78

.gitlab-ci.yml

+31 −15
Original line number Diff line number Diff line 
image: docker:stable

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



stages:

  - deploy



variables:

  DOCKER_DRIVER: overlay2



services:

  - docker:dind



deploy-dev:

  stage: deploy

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

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}

    STACK: gis

    SERVICES_TO_CHECK: gis_${CI_PROJECT_NAME}

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

    SFTP_USERS: ${DEV_SFTP_USERS}

    PUBLIC_PORT: ${DEV_PUBLIC_PORT}

  script:

    - >

      deploy.sh COMPOSE_FILE=${COMPOSE_FILE} SFTP_USERS=${SFTP_USERS} PUBLIC_PORT=${PUBLIC_PORT}

  environment:

    name: dev

  only:

    - dev

  when: manual



deploy-supporting-branch:

  stage: deploy

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: gis

    SERVICES_TO_CHECK: gis_${CI_PROJECT_NAME}

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

    SFTP_USERS: ${DEV_SFTP_USERS}

    PUBLIC_PORT: ${DEV_PUBLIC_PORT}

  services:

    - docker:dind

  script:

    - >

      deploy.sh COMPOSE_FILE=${COMPOSE_FILE} SFTP_USERS=${SFTP_USERS}

      PUBLIC_PORT=${PUBLIC_PORT}

      deploy.sh COMPOSE_FILE=${COMPOSE_FILE} SFTP_USERS=${SFTP_USERS} PUBLIC_PORT=${PUBLIC_PORT}

  environment:

    name: dev

  only:

    - branches

  except:

    - master

    - dev

  when: manual



deploy-pro:

  stage: deploy

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

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STACK: gis

    SERVICES_TO_CHECK: gis_${CI_PROJECT_NAME}

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

    SFTP_USERS: ${PRO_SFTP_USERS}

    PUBLIC_PORT: ${PRO_PUBLIC_PORT}

  services:

    - docker:dind

  script:

    - >

      deploy.sh COMPOSE_FILE=${COMPOSE_FILE} SFTP_USERS=${SFTP_USERS}

      PUBLIC_PORT=${PUBLIC_PORT}

      deploy.sh COMPOSE_FILE=${COMPOSE_FILE} SFTP_USERS=${SFTP_USERS} PUBLIC_PORT=${PUBLIC_PORT}

  environment:

    name: pro

  only:

docker-compose.dev.yml

+12 −4
Original line number Diff line number Diff line
@@ -2,10 +2,18 @@ version: '3.5' 


services:

  sftp:

    image: atmoz/sftp:alpine

    container_name: sftp

    restart: on-failure:3



    deploy:

      mode: replicated

      replicas: 1

      restart_policy:

        delay: 30s

        window: 1m

      resources:

        limits:

          cpus: '0.5'

          memory: 8M

        reservations:

          memory: 7M

volumes:

  geoserver-vol:

    name: geoserver-vol

docker-compose.prod.yml

+8 −3
Original line number Diff line number Diff line
@@ -9,9 +9,14 @@ services: 
        constraints:

          - node.role == manager

      restart_policy:

        condition: on-failure

        delay: 1m

        window: 3m

        delay: 30s

        window: 1m

      resources:

        limits:

          cpus: '0.5'

          memory: 8M

        reservations:

          memory: 7M



volumes:

  geoserver-vol:

docker-compose.tmpl.yml

+3 −1
Original line number Diff line number Diff line
@@ -7,7 +7,9 @@ services: 
    networks:

      - gis-net

    ports:

      - "${PUBLIC_PORT}:22"

      - target: 22

        published: ${PUBLIC_PORT}

        mode: host

    volumes:

        - geoserver-vol:/home/geoserver/geoserver