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

Actualiza ficheros compose y plantillas CI

parent 6c8cce20

.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

+1 −0
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

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

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



services:

  nifi:

    image: ${IMAGE_NAME:-apache/nifi}:${IMAGE_TAG:-latest}