diff --git a/deploy/nifi.env b/deploy/nifi.env index 35826b8d..14c47c81 100644 --- a/deploy/nifi.env +++ b/deploy/nifi.env @@ -3,7 +3,7 @@ NIFI_ENV_FILE="./nifi.env" NIFI_SECURITY_DIR="../security/certificates/nifi/" NIFI_DATA_PATH="../data/" -NIFI_VERSION="2.6.0" +NIFI_VERSION="2.7.0" NIFI_TOOLKIT_VERSION=$NIFI_VERSION NIFI_SHM_SIZE="1g" diff --git a/deploy/services-dev.yml b/deploy/services-dev.yml index 24d944bd..cc4fa896 100644 --- a/deploy/services-dev.yml +++ b/deploy/services-dev.yml @@ -115,7 +115,7 @@ services: - cognet nifi-registry-flow: - image: apache/nifi-registry:${NIFI_REGISTRY_VERSION:-2.6.0} + image: apache/nifi-registry:${NIFI_REGISTRY_VERSION:-2.7.0} hostname: nifi-registry container_name: cogstack-nifi-registry-flow restart: always diff --git a/deploy/services.yml b/deploy/services.yml index 362308a5..50902023 100644 --- a/deploy/services.yml +++ b/deploy/services.yml @@ -498,7 +498,7 @@ services: nifi-registry-flow: <<: *nifi-common - image: apache/nifi-registry:${NIFI_REGISTRY_VERSION:-2.6.0} + image: apache/nifi-registry:${NIFI_REGISTRY_VERSION:-2.7.0} hostname: nifi-registry container_name: cogstack-nifi-registry-flow shm_size: ${NIFI_REGISTRY_SHM_SIZE:-"1g"} diff --git a/nifi/Dockerfile b/nifi/Dockerfile index 35aa3f2d..ebd15868 100644 --- a/nifi/Dockerfile +++ b/nifi/Dockerfile @@ -1,4 +1,4 @@ -ARG NIFI_VERSION=2.6.0 +ARG NIFI_VERSION=2.7.0 FROM apache/nifi:${NIFI_VERSION} diff --git a/scripts/installation_utils/install_docker_and_utils.sh b/scripts/installation_utils/install_docker_and_utils.sh index 97e0491b..e3a7483f 100644 --- a/scripts/installation_utils/install_docker_and_utils.sh +++ b/scripts/installation_utils/install_docker_and_utils.sh @@ -24,6 +24,9 @@ then curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg sudo chmod a+r /etc/apt/keyrings/docker.gpg + echo "Installing Azure CLI..." + curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash + echo \ "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \ "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | \ @@ -67,6 +70,10 @@ then # install necessary prerequisites sudo yum install -y jq yum-utils wget curl git device-mapper-persistent-data lvm2 python3 python3-pip libffi-devel openssl-devel zip unzip tar nano gcc gcc-c++ make python3-devel libevent-devel + + echo "Installing Azure CLI..." + sudo rpm --import https://packages.microsoft.com/keys/microsoft-2025.asc + sudo dnf install azure-cli sudo yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo sudo yum-config-manager --enable docker-ce-stable diff --git a/services/nginx/config/nginx.conf b/services/nginx/config/nginx.conf index 486d7032..cb20836a 100644 --- a/services/nginx/config/nginx.conf +++ b/services/nginx/config/nginx.conf @@ -238,14 +238,14 @@ http { # proxy_pass https://nifi$1; # } - location ^~ /nifi-standard-content-viewer-2.6.0/ { + location ^~ /nifi-standard-content-viewer-2.7.0/ { proxy_set_header Host nifi; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-ProxyHost $host; proxy_set_header X-ProxyPort 8443; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-ProxyScheme $scheme; - proxy_pass https://nifi/nifi-standard-content-viewer-2.6.0/; + proxy_pass https://nifi/nifi-standard-content-viewer-2.7.0/; } } }