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

Merge branch 'dev' into 'master' 

Actualiza compose y fija a manager siempre

See merge request redmic-project/maintenance/portainer!8
parents efc0a8e0 c3a6a1cf

deploy/docker-compose.dev.yml→deploy/compose.dev.yaml

+0 −2
Original line number Diff line number Diff line 
version: '3.9'



volumes:

  data-vol:

    name: ${DATA_VOL_NAME}

deploy/docker-compose.prod.yml→deploy/compose.prod.yaml

+6 −0
Original line number Diff line number Diff line 
version: '3.9'



services:

  portainer-ce:

    deploy:

      placement:

        constraints:

          - node.role == manager



volumes:

  data-vol:

    name: ${DATA_VOL_NAME}

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

+6 −5
Original line number Diff line number Diff line 
version: '3.9'



services:

  portainer-agent:

    image: ${PORTAINER_AGENT_IMAGE_NAME:-portainer/agent}:${PORTAINER_AGENT_IMAGE_TAG:-latest}
@@ -42,22 +40,25 @@ services: 
    deploy:

      mode: replicated

      replicas: ${PORTAINER_CE_REPLICAS:-1}

      placement:

        constraints:

          - node.role == manager

      restart_policy:

        delay: ${PORTAINER_CE_RESTART_DELAY:-10s}

      update_config:

        delay: ${PORTAINER_CE_UPDATE_DELAY:-1m}

      labels:

        traefik.enable: 'true'

        traefik.enable: ${TRAEFIK_ENABLE:-true}

        traefik.http.routers.portainer.entrypoints: ${TRAEFIK_ENTRYPOINT:-http}

        traefik.http.routers.portainer.rule: Host(`${TRAEFIK_SUBDOMAIN:-portainer}.${PUBLIC_HOSTNAME}`)

        traefik.http.services.portainer.loadbalancer.server.port: ${PORTAINER_CE_PORT}

      resources:

        limits:

          cpus: '${PORTAINER_CE_RESOURCES_LIMITS_CPUS:-0.5}'

          memory: ${PORTAINER_CE_RESOURCES_LIMITS_MEMORY:-64M}

          memory: ${PORTAINER_CE_RESOURCES_LIMITS_MEMORY:-128M}

        reservations:

          cpus: '${PORTAINER_CE_RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${PORTAINER_CE_RESOURCES_RESERVATIONS_MEMORY:-16M}

          memory: ${PORTAINER_CE_RESOURCES_RESERVATIONS_MEMORY:-32M}



networks:

  portainer-net: