Commit 9fa948b7 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Revert "Añade variable password para encriptar propiedades"

See merge request redmic-project/nifi!5
parents 73518e10 9615cab2

.gitlab-ci.yml

+4 −4
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ deploy-nifi-supporting-branch-develop: 
  script:

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      UI_AUTH=${UI_AUTH} NIFI_SENSITIVE_PROPS_KEY=${NIFI_SENSITIVE_PROPS_KEY}

      UI_AUTH=${UI_AUTH}

  environment:

    name: dev/${CI_PROJECT_NAME}

  only:
@@ -104,7 +104,7 @@ deploy-nifi-stable-branch-develop: 
  script:

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      UI_AUTH=${UI_AUTH} NIFI_SENSITIVE_PROPS_KEY=${NIFI_SENSITIVE_PROPS_KEY}

      UI_AUTH=${UI_AUTH}

  environment:

    name: dev/${CI_PROJECT_NAME}

  only:
@@ -124,7 +124,7 @@ deploy-nifi-supporting-branch-production: 
  script:

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      UI_AUTH=${UI_AUTH} NIFI_SENSITIVE_PROPS_KEY=${NIFI_SENSITIVE_PROPS_KEY}

      UI_AUTH=${UI_AUTH}

  environment:

    name: pro/${CI_PROJECT_NAME}

  only:
@@ -146,7 +146,7 @@ deploy-nifi-stable-branch-production: 
  script:

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      UI_AUTH=${UI_AUTH} NIFI_SENSITIVE_PROPS_KEY=${NIFI_SENSITIVE_PROPS_KEY}

      UI_AUTH=${UI_AUTH}

  environment:

    name: pro/${CI_PROJECT_NAME}

  only:

deploy/docker-compose.nifi.tmpl.yml

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ services: 
    environment:

      - NIFI_LOG_DIR

      - NIFI_HOME

      - NIFI_SENSITIVE_PROPS_KEY

    networks:

      - traefik-net

      - kafka-net