Commit 9d94e3ae authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/etl/nifi!27
parents a82b6a46 21df1ab2

.gitlab-ci.yml

+1 −3
Original line number Diff line number Diff line 
include:

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment.yml'

    file: '/deployment-service/docker-deploy.yml'



stages:

  - deploy
@@ -10,5 +10,3 @@ stages: 
  variables:

    STACK: etl

    STATUS_CHECK_DELAY: 300
 
  environment:

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

deploy/.env

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ PROVENANCE_VOL_NAME=nifi-provenance-vol 
STATE_VOL_NAME=nifi-state-vol

SECURITY_VOL_NAME=nifi-security-vol



VOL_DRIVER=local

VOL_TYPE=nfs4

VOL_ADDR=127.0.0.1

VOL_OPTIONS=rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14
 
VOL_OPTS=rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14

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

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



volumes:

  conf-vol:

    name: ${CONF_VOL_NAME}

    driver: local

    driver: ${VOL_DRIVER}

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTS}
@@ -11,7 +9,7 @@ volumes: 


  database-vol:

    name: ${DATABASE_VOL_NAME}

    driver: local

    driver: ${VOL_DRIVER}

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTS}
@@ -19,7 +17,7 @@ volumes: 


  flowfile-vol:

    name: ${FLOWFILE_VOL_NAME}

    driver: local

    driver: ${VOL_DRIVER}

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTS}
@@ -27,7 +25,7 @@ volumes: 


  content-vol:

    name: ${CONTENT_VOL_NAME}

    driver: local

    driver: ${VOL_DRIVER}

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTS}
@@ -35,7 +33,7 @@ volumes: 


  provenance-vol:

    name: ${PROVENANCE_VOL_NAME}

    driver: local

    driver: ${VOL_DRIVER}

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTS}
@@ -43,7 +41,7 @@ volumes: 


  state-vol:

    name: ${STATE_VOL_NAME}

    driver: local

    driver: ${VOL_DRIVER}

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTS}
@@ -51,7 +49,7 @@ volumes: 


  security-vol:

    name: ${SECURITY_VOL_NAME}

    driver: local

    driver: ${VOL_DRIVER}

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTS}

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

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



services:

  nifi:

    deploy:

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

+12 −10
Original line number Diff line number Diff line 
version: '3.9'



services:

  nifi:

    image: ${IMAGE_NAME:-apache/nifi}:${IMAGE_TAG:-latest}
@@ -67,14 +65,18 @@ services: 
          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.2}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-3G}

      labels:

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

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

        traefik.frontend.redirect.regex: ^(.*://${TRAEFIK_SUBDOMAIN}.${PUBLIC_HOSTNAME})/$$

        traefik.frontend.redirect.replacement: $$1/nifi

        traefik.frontend.redirect.permanent: 'true'

        traefik.backend: nifi

        traefik.protocol: https

        traefik.port: '${NIFI_WEB_HTTPS_PORT}'

        traefik.enable: ${TRAEFIK_ENABLE:-true}

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

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

        traefik.http.middlewares.nifi-redirect.redirectregex.regex: ^(.*://${TRAEFIK_SUBDOMAIN}.${PUBLIC_HOSTNAME})/$$

        traefik.http.middlewares.nifi-redirect.redirectregex.replacement: $$1/nifi

        traefik.http.middlewares.nifi-redirect.redirectregex.permanent: 'true'

        traefik.http.middlewares.nifi-headers-1.headers.customrequestheaders.X-ProxyScheme: https

        traefik.http.middlewares.nifi-headers-2.headers.customrequestheaders.X-ProxyHost: ${TRAEFIK_SUBDOMAIN}.${PUBLIC_HOSTNAME}

        traefik.http.middlewares.nifi-headers-3.headers.customrequestheaders.X-ProxyPort: 443

        traefik.http.routers.nifi.middlewares: nifi-redirect, nifi-headers-1, nifi-headers-2, nifi-headers-3

        traefik.http.services.nifi.loadbalancer.server.port: ${NIFI_WEB_HTTPS_PORT}

        traefik.http.services.nifi.loadbalancer.server.scheme: https



networks:

  traefik-net: