Deploy: added env vars for nifi/nifi registry docker images.

Author: vladd-bit

deploy/nifi.env

@@ -24,12 +24,21 @@ NIFI_DOCKER_LOG_NUM_FILES=10
 
 ##############################################################################################################################
 
-# NiFi
+NIFI_VERSION="2.7.2"
+NIFI_REGISTRY_VERSION=$NIFI_VERSION
+
+# NiFi/NiFi Registry Docker image
+NIFI_DOCKER_IMAGE="cogstacksystems/cogstack-nifi:latest"
+NIFI_REGISTRY_DOCKER_IMAGE="apache/nifi-registry:${NIFI_REGISTRY_VERSION:-2.7.2}"
+
+
+##############################################################################################################################
+# NIFI SECTION
+##############################################################################################################################
 NIFI_ENV_FILE="./nifi.env"
 NIFI_SECURITY_DIR="../security/certificates/nifi/"
 NIFI_DATA_PATH="../data/"
 
-NIFI_VERSION="2.7.2"
 NIFI_TOOLKIT_VERSION=$NIFI_VERSION
 
 #### Port and network settings
@@ -47,8 +56,6 @@ NIFI_INTERNAL_PORT=8443
 # this is for the nginx service
 NIFI_EXTERNAL_PORT_NGINX=8443
 NIFI_INTERNAL_PORT_NGINX=8443
-NIFI_REGISTRY_EXTERNAL_PORT_NGINX=18443
-NIFI_REGISTRY_INTERNAL_PORT_NGINX=18443
 
 NIFI_OUTPUT_PORT=8082
 NIFI_INPUT_SOCKET_PORT=10000
@@ -80,9 +87,6 @@ NIFI_AUTH=tls
 NIFI_KEYSTORE_PATH="/security/certificates/nifi/nifi-keystore.jks"
 NIFI_TRUSTSTORE_PATH="/security/certificates/nifi/nifi-truststore.jks"
 
-NIFI_REGISTRY_KEYSTORE_PATH="/security/certificates/nifi/nifi-keystore.jks"
-NIFI_REGISTRY_TRUSTSTORE_PATH="/security/certificates/nifi/nifi-truststore.jks"
-
 NIFI_KEYSTORE_TYPE=JKS
 NIFI_TRUSTSTORE_TYPE=JKS
 
@@ -92,10 +96,16 @@ NIFI_INITIAL_ADMIN_IDENTITY="cogstack"
 ##############################################################################################################################
 # NIFI REGISTRY FLOW SECTION
 ##############################################################################################################################
-NIFI_REGISTRY_VERSION=$NIFI_VERSION
 NIFI_REGISTRY_DB_DIR=/opt/nifi-registry/nifi-registry-current/database
 NIFI_REGISTRY_FLOW_PROVIDER=file
 NIFI_REGISTRY_FLOW_STORAGE_DIR=/opt/nifi-registry/nifi-registry-current/flow_storage
 
 NIFI_REGISTRY_FLOW_OUTPUT_PORT=8083
 NIFI_REGISTRY_FLOW_INPUT_PORT=18443
+
+NIFI_REGISTRY_EXTERNAL_PORT_NGINX=18443
+NIFI_REGISTRY_INTERNAL_PORT_NGINX=18443
+
+NIFI_REGISTRY_KEYSTORE_PATH="/security/certificates/nifi/nifi-keystore.jks"
+NIFI_REGISTRY_TRUSTSTORE_PATH="/security/certificates/nifi/nifi-truststore.jks"
+

deploy/services.dev.yml

@@ -166,7 +166,7 @@ services:
 
   nifi-registry-flow:
     <<: *nifi-common
-    image: apache/nifi-registry:${NIFI_REGISTRY_VERSION:-2.7.2}
+    image: ${NIFI_REGISTRY_DOCKER_IMAGE:-apache/nifi-registry:${NIFI_REGISTRY_VERSION:-latest}}
     hostname: nifi-registry
     container_name: cogstack-nifi-registry-flow
     shm_size: ${NIFI_DOCKER_REGISTRY_SHM_SIZE:-1g}

deploy/services.yml

@@ -164,7 +164,7 @@ x-es-common-volumes: &es-common-volumes
 
 x-es-common: &es-common
   <<: *common-ulimits
-  image: ${ELASTICSEARCH_DOCKER_IMAGE:-opensearchproject/opensearch:3.3.0}
+  image: ${ELASTICSEARCH_DOCKER_IMAGE:-opensearchproject/opensearch:latest}
   shm_size: ${ELASTICSEARCH_DOCKER_SHM_SIZE:-1g}
   restart: unless-stopped
   env_file: *es-env
@@ -190,7 +190,7 @@ x-es-common: &es-common
 
 x-metricbeat-common: &metricbeat-common
   <<: *common-ulimits
-  image: ${METRICBEAT_IMAGE:-docker.elastic.co/beats/metricbeat:8.18.2}
+  image: ${METRICBEAT_IMAGE:-docker.elastic.co/beats/metricbeat:latest}
   command: -e --strict.perms=false
   restart: unless-stopped
   shm_size: ${METRICBEAT_DOCKER_SHM:-1g}
@@ -221,7 +221,7 @@ x-metricbeat-common: &metricbeat-common
 
 x-filebeat-common: &filebeat-common
   <<: *common-ulimits
-  image: ${FILEBEAT_IMAGE:-docker.elastic.co/beats/filebeat:8.18.2}
+  image: ${FILEBEAT_IMAGE:-docker.elastic.co/beats/filebeat:latest}
   command: ${FILEBEAT_STARTUP_COMMAND:-'-e --strict.perms=false'}
   restart: unless-stopped
   shm_size: ${FILEBEAT_DOCKER_SHM:-1g}
@@ -333,7 +333,7 @@ services:
 #---------------------------------------------------------------------------#
   es_native_create_certs:
     container_name: es_create_certs
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.18.2
+    image: docker.elastic.co/elasticsearch/elasticsearch:latest
     shm_size: ${ELASTICSEARCH_DOCKER_SHM_SIZE:-1g}
     env_file: *es-env
     restart: "no"
@@ -471,7 +471,7 @@ services:
 #---------------------------------------------------------------------------#
   kibana:
     <<: *common-ulimits
-    image: ${ELASTICSEARCH_KIBANA_DOCKER_IMAGE:-opensearchproject/opensearch-dashboards:3.3.0}
+    image: ${ELASTICSEARCH_KIBANA_DOCKER_IMAGE:-opensearchproject/opensearch-dashboards:latest}
     container_name: cogstack-kibana
     shm_size: ${KIBANA_DOCKER_SHM_SIZE:-1g}
     restart: always
@@ -520,7 +520,7 @@ services:
 #---------------------------------------------------------------------------#
   nifi:
     <<: *nifi-common
-    image: cogstacksystems/cogstack-nifi:latest
+    image: ${NIFI_DOCKER_IMAGE:-cogstacksystems/cogstack-nifi:latest}
     container_name: cogstack-nifi
     hostname: nifi
     shm_size: ${NIFI_DOCKER_SHM_SIZE:-"1g"}
@@ -556,7 +556,7 @@ services:
 
   nifi-registry-flow:
     <<: *nifi-common
-    image: apache/nifi-registry:${NIFI_REGISTRY_VERSION:-2.7.2}
+    image: ${NIFI_REGISTRY_DOCKER_IMAGE:-apache/nifi-registry:${NIFI_REGISTRY_VERSION:-latest}}
     hostname: nifi-registry
     container_name: cogstack-nifi-registry-flow
     shm_size: ${NIFI_DOCKER_REGISTRY_SHM_SIZE:-1g}