Commit 53c38e5d authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Actualiza deploy de portainer, modifica vol y net

See merge request redmic-project/service-deployment!25
parents 770fb366 d76648fa

.gitlab-ci.yml

+11 −3
Original line number Diff line number Diff line 
stages:

  - deploy



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

image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}



services:

  - docker:dind
@@ -206,9 +206,13 @@ deploy-portainer-dev: 
    STACK: portainer

    SERVICES_TO_CHECK: portainer_agent portainer_portainer

    IMAGE_TAG: latest

    AGENT_IMAGE_TAG: latest

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

    AGENT_DOCKER_VOLUMES_PATH: ${DEV_AGENT_DOCKER_VOLUMES_PATH}

  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${DEV_PUBLIC_HOSTNAME}

    - >

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

      PUBLIC_HOSTNAME=${DEV_PUBLIC_HOSTNAME} AGENT_DOCKER_VOLUMES_PATH=${AGENT_DOCKER_VOLUMES_PATH}

  environment:

    name: dev/portainer

    url: https://portainer.${DEV_PUBLIC_HOSTNAME}
@@ -224,9 +228,13 @@ deploy-portainer-pro: 
    STACK: portainer

    SERVICES_TO_CHECK: portainer_agent portainer_portainer

    IMAGE_TAG: latest

    AGENT_IMAGE_TAG: latest

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

    AGENT_DOCKER_VOLUMES_PATH: ${PRO_AGENT_DOCKER_VOLUMES_PATH}

  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PRO_PUBLIC_HOSTNAME}

    - >

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

      PUBLIC_HOSTNAME=${PRO_PUBLIC_HOSTNAME} AGENT_DOCKER_VOLUMES_PATH=${AGENT_DOCKER_VOLUMES_PATH}

  environment:

    name: pro/portainer

    url: https://portainer.${PRO_PUBLIC_HOSTNAME}

portainer/.env

+2 −0
Original line number Diff line number Diff line 
AGENT_PORT=9001

LOG_LEVEL=error

portainer/docker-compose.dev.yml

+1 −38
Original line number Diff line number Diff line 
version: '3.5'



services:

  agent:

    deploy:

      mode: global

      restart_policy:

        delay: 10s

        window: 1m

      resources:

        limits:

          cpus: '0.5'

          memory: 512M

        reservations:

          memory: 410M



  portainer:

    ports:

      - target: 9000

        published: 6020

        mode: host

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.port: "9000"

        traefik.docker.network: traefik-net

        traefik.frontend.rule: Host:portainer.${PUBLIC_HOSTNAME}

        traefik.backend: portainer

      restart_policy:

        delay: 30s

        window: 2m

      resources:

        limits:

          cpus: '0.5'

          memory: 512M

        reservations:

          memory: 410M



volumes:

  portainer-vol:

    name: portainer-vol
 
    name: ${PORTAINER_VOL_NAME:-portainer-vol}

portainer/docker-compose.prod.yml

+4 −34
Original line number Diff line number Diff line 
version: '3.5'



services:

  agent:

    deploy:

      mode: global

      restart_policy:

        delay: 10s

        window: 1m

      resources:

        limits:

          cpus: '0.5'

          memory: 512M

        reservations:

          memory: 410M



  portainer:

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.port: "9000"

        traefik.docker.network: traefik-net

        traefik.frontend.rule: Host:portainer.${PUBLIC_HOSTNAME}

        traefik.backend: portainer

      placement:

        constraints:

          - node.role == manager

      restart_policy:

        delay: 30s

        window: 2m

      resources:

        limits:

          cpus: '0.5'

          memory: 512M

        reservations:

          memory: 410M



volumes:

  portainer-vol:

    name: portainer-vol

    driver: "cloudstor:aws"

    name: ${PORTAINER_VOL_NAME:-portainer-vol}

    driver: 'cloudstor:aws'

    driver_opts:

      backing: relocatable

      size: 1

      ebstype: gp2
 
      backing: shared

      perfmode: maxio

portainer/docker-compose.tmpl.yml

+41 −9
Original line number Diff line number Diff line
@@ -2,27 +2,59 @@ version: '3.5' 


services:

  agent:

    image: portainer/agent

    image: portainer/agent:${AGENT_IMAGE_TAG:-latest}

    environment:

      AGENT_CLUSTER_ADDR: tasks.{{.Service.Name}}

      AGENT_PORT: 9001

      LOG_LEVEL: error

      - LOG_LEVEL

      - AGENT_PORT

      - AGENT_CLUSTER_ADDR=tasks.{{.Service.Name}}

    networks:

      - redmic-net

      - portainer-net

    volumes:

      - /var/run/docker.sock:/var/run/docker.sock

      - ${AGENT_DOCKER_VOLUMES_PATH:-/var/lib/docker/volumes}:/var/lib/docker/volumes

    deploy:

      mode: global

      restart_policy:

        delay: 3s

        window: 30s

      resources:

        limits:

          cpus: '0.5'

          memory: 256M

        reservations:

          memory: 64M



  portainer:

    image: portainer/portainer:${IMAGE_TAG:-latest}

    command: -H tcp://tasks.portainer_agent:9001 --tlsskipverify

    command: -H tcp://tasks.portainer_agent:${AGENT_PORT} --tlsskipverify

    networks:

      - redmic-net

      - portainer-net

      - traefik-net

    volumes:

      - portainer-vol:/data

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.frontend.rule: Host:portainer.${PUBLIC_HOSTNAME}

        traefik.backend: portainer

        traefik.port: '9000'

      restart_policy:

        delay: 30s

        window: 1m

      resources:

        limits:

          cpus: '0.5'

          memory: 512M

        reservations:

          memory: 64M



networks:

  redmic-net:

    external: true

  portainer-net:

    name: ${PORTAINER_NET_NAME:-portainer-net}

    driver: overlay

    attachable: ${PORTAINER_NET_ATTACHABLE:-true}



  traefik-net:

    name: ${TRAEFIK_NET_NAME:-traefik-net}

    external: true