Commit e33e194e authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Acutaliza volúmenes y recursos de producción

See merge request redmic-project/nifi!8
parents b8f2e868 6c23fb85

deploy/docker-compose.nifi.dev.yml

+10 −0
Original line number Diff line number Diff line 
version: '3.5'



services:

  nifi:

    deploy:

      resources:

        limits:

          cpus: '1'

          memory: 1G

        reservations:

          memory: 820M



volumes:

  nifi-conf-vol:

    name: ${NIFI_CONF_VOL_NAME:-nifi-conf-vol}

deploy/docker-compose.nifi.prod.yml

+9 −6
Original line number Diff line number Diff line
@@ -6,6 +6,13 @@ services: 
      placement:

        constraints:

          - node.role == worker

      resources:

        limits:

          cpus: '1'

          memory: 2G

        reservations:

          cpus: '0.5'

          memory: 1639M



volumes:

  nifi-conf-vol:
@@ -18,17 +25,13 @@ volumes: 
    name: ${NIFI_DATABASE_VOL_NAME:-nifi-database-vol}

    driver: "cloudstor:aws"

    driver_opts:

      backing: relocatable

      size: 1

      ebstype: gp2

      backing: shared



  nifi-flowfile-vol:

    name: ${NIFI_FLOWFILE_VOL_NAME:-nifi-flowfile-vol}

    driver: "cloudstor:aws"

    driver_opts:

      backing: relocatable

      size: 1

      ebstype: gp2

      backing: shared



  nifi-content-vol:

    name: ${NIFI_CONTENT_VOL_NAME:-nifi-content-vol}

deploy/docker-compose.nifi.tmpl.yml

+1 −7
Original line number Diff line number Diff line
@@ -34,18 +34,12 @@ services: 
      labels:

        traefik.frontend.auth.basic.users: ${UI_AUTH}

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

        traefik.backend: nifi

        traefik.frontend.headers.customRequestHeaders: X-ProxyScheme:https||X-ProxyHost:nifi.${PUBLIC_HOSTNAME}||X-ProxyPort:443

        traefik.backend: nifi

        traefik.port: "${PORT}"

      restart_policy:

        delay: 30s

        window: 2m

      resources:

        limits:

          cpus: '1'

          memory: 1G

        reservations:

          memory: 820M



networks:

  traefik-net: