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

Merge branch 'dev' into 'master' 

migra a v2, renombra servicios e introduce volumen nfs

See merge request redmic-project/maintenance/portainer!5
parents b00b519e 8b64cc89

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ stages: 


.deploy:

  variables:

    SERVICES_TO_CHECK: ${CI_PROJECT_NAME}_agent ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}

    STACK: maintenance

  environment:

    url: https://${CI_PROJECT_NAME}.${PUBLIC_HOSTNAME}

deploy/.env

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

LOG_LEVEL=error

PORTAINER_PORT=9000

PORTAINER_VOL_NAME=portainer-vol
 
PORTAINER_CE_PORT=9000

PORTAINER_CE_DATA_VOL_NAME=portainer-vol

deploy/docker-compose.dev.yml

+7 −9
Original line number Diff line number Diff line 
version: '3.5'



services:

  portainer:

    deploy:

      placement:

        constraints:

          - node.hostname == ${PLACEMENT_CONSTRAINTS_NODE_HOSTNAME:-hostname}



volumes:

  portainer-vol:

    name: ${PORTAINER_VOL_NAME}
 
  data-vol:

    name: ${PORTAINER_CE_DATA_VOL_NAME}

    driver: local

    driver_opts:

      type: ${PORTAINER_CE_DATA_VOL_TYPE:-nfs4}

      o: addr=${PORTAINER_CE_DATA_VOL_ADDR:-127.0.0.1},${PORTAINER_CE_DATA_VOL_OPTIONS:-rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14}

      device: ${PORTAINER_CE_DATA_VOL_DEVICE:-:/portainer-vol/}

deploy/docker-compose.prod.yml

+3 −3
Original line number Diff line number Diff line 
version: '3.5'



services:

  portainer:

  portainer-ce:

    deploy:

      placement:

        constraints:

          - node.role == manager



volumes:

  portainer-vol:

    name: ${PORTAINER_VOL_NAME}

  data-vol:

    name: ${PORTAINER_CE_DATA_VOL_NAME}

    driver: 'cloudstor:aws'

    driver_opts:

      backing: shared

deploy/docker-compose.tmpl.yml

+22 −22
Original line number Diff line number Diff line 
version: '3.5'



services:

  agent:

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

  portainer-agent:

    image: ${PORTAINER_AGENT_IMAGE_NAME:-portainer/agent}:${PORTAINER_AGENT_IMAGE_TAG:-latest}

    environment:

      LOG_LEVEL:

      AGENT_PORT:
@@ -11,52 +11,52 @@ services: 
      portainer-net:

    volumes:

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

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

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

    deploy:

      mode: global

      restart_policy:

        delay: ${AGENT_RESTART_DELAY:-3s}

        delay: ${PORTAINER_AGENT_RESTART_DELAY:-3s}

      update_config:

        delay: ${AGENT_UPDATE_DELAY:-1m}

        delay: ${PORTAINER_AGENT_UPDATE_DELAY:-1m}

      resources:

        limits:

          cpus: '${AGENT_RESOURCES_LIMITS_CPUS:-0.5}'

          memory: ${AGENT_RESOURCES_LIMITS_MEMORY:-64M}

          cpus: '${PORTAINER_AGENT_RESOURCES_LIMITS_CPUS:-0.5}'

          memory: ${PORTAINER_AGENT_RESOURCES_LIMITS_MEMORY:-64M}

        reservations:

          cpus: '${AGENT_RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${AGENT_RESOURCES_RESERVATIONS_MEMORY:-16M}

          cpus: '${PORTAINER_AGENT_RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${PORTAINER_AGENT_RESOURCES_RESERVATIONS_MEMORY:-16M}



  portainer:

    image: ${PORTAINER_IMAGE_NAME:-portainer/portainer}:${PORTAINER_IMAGE_TAG:-latest}

  portainer-ce:

    image: ${PORTAINER_CE_IMAGE_NAME:-portainer/portainer-ce}:${PORTAINER_CE_IMAGE_TAG:-latest}

    command:

      - -H

      - tcp://tasks.${STACK_NAME:-portainer}_agent:${AGENT_PORT}

      - tcp://tasks.${STACK_NAME:-maintenance}_portainer-agent:${AGENT_PORT}

      - --tlsskipverify

      - -p

      - :${PORTAINER_PORT}

      - :${PORTAINER_CE_PORT}

    networks:

      portainer-net:

      traefik-net:

    volumes:

      - portainer-vol:/data

      - data-vol:/data

    deploy:

      mode: replicated

      replicas: ${PORTAINER_REPLICAS:-1}

      replicas: ${PORTAINER_CE_REPLICAS:-1}

      restart_policy:

        delay: ${PORTAINER_RESTART_DELAY:-10s}

        delay: ${PORTAINER_CE_RESTART_DELAY:-10s}

      update_config:

        delay: ${PORTAINER_UPDATE_DELAY:-1m}

        delay: ${PORTAINER_CE_UPDATE_DELAY:-1m}

      labels:

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

        traefik.backend: portainer

        traefik.port: '${PORTAINER_PORT}'

        traefik.port: '${PORTAINER_CE_PORT}'

      resources:

        limits:

          cpus: '${PORTAINER_RESOURCES_LIMITS_CPUS:-0.5}'

          memory: ${PORTAINER_RESOURCES_LIMITS_MEMORY:-64M}

          cpus: '${PORTAINER_CE_RESOURCES_LIMITS_CPUS:-0.5}'

          memory: ${PORTAINER_CE_RESOURCES_LIMITS_MEMORY:-64M}

        reservations:

          cpus: '${PORTAINER_RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${PORTAINER_RESOURCES_RESERVATIONS_MEMORY:-16M}

          cpus: '${PORTAINER_CE_RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${PORTAINER_CE_RESOURCES_RESERVATIONS_MEMORY:-16M}



networks:

  portainer-net: