streampipes-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zehn...@apache.org
Subject [incubator-streampipes-installer] branch dev updated: Removed kafka host and added docker.host.internal for each service
Date Fri, 20 Dec 2019 13:17:45 GMT
This is an automated email from the ASF dual-hosted git repository.

zehnder pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-installer.git


The following commit(s) were added to refs/heads/dev by this push:
     new 8062072  Removed kafka host and added docker.host.internal for each service
     new 9990871  Merge branch 'dev' of github.com:apache/incubator-streampipes-installer
into dev
8062072 is described below

commit 8062072a31818176437a35525873f1a056d2a05b
Author: Philipp Zehnder <zehnder@fzi.de>
AuthorDate: Fri Dec 20 14:16:11 2019 +0100

    Removed kafka host and added docker.host.internal for each service
---
 cli/services/app-container/docker-compose.yml               |  2 ++
 cli/services/backend/docker-compose.yml                     |  6 +++---
 cli/services/connect-master/docker-compose.yml              |  5 +++--
 cli/services/connect-worker-main/docker-compose.yml         |  5 +++--
 cli/services/consul/docker-compose.yml                      |  2 ++
 cli/services/couchdb/docker-compose.yml                     |  2 ++
 cli/services/crate/docker-compose.yml                       |  2 ++
 cli/services/elasticsearch/docker-compose.yml               |  2 ++
 cli/services/filebeat/docker-compose.yml                    |  2 ++
 cli/services/grafana/docker-compose.yml                     |  2 ++
 cli/services/influxdb/docker-compose.yml                    |  2 ++
 cli/services/iotdb/docker-compose.yml                       |  2 ++
 cli/services/jobmanager/docker-compose.yml                  |  2 ++
 cli/services/kafka-rest/docker-compose.yml                  |  2 ++
 cli/services/kafka/docker-compose.yml                       |  8 +++++---
 cli/services/kibana/docker-compose.yml                      |  2 ++
 cli/services/logstash/docker-compose.yml                    |  2 ++
 cli/services/mariadb/docker-compose.yml                     |  2 ++
 cli/services/mysql/docker-compose.yml                       |  2 ++
 cli/services/nginx/docker-compose.yml                       |  2 ++
 cli/services/opcua/docker-compose.yml                       |  2 ++
 cli/services/pgadmin/docker-compose.yml                     |  2 ++
 cli/services/phpmyadmin/docker-compose.yml                  |  2 ++
 cli/services/pipeline-elements-all-jvm/docker-compose.yml   |  7 +++----
 cli/services/postgres/docker-compose.yml                    |  2 ++
 .../processors-aggregation-flink/docker-compose.yml         |  7 +++----
 cli/services/processors-enricher-flink/docker-compose.yml   |  7 +++----
 cli/services/processors-filters-jvm/docker-compose.yml      |  7 +++----
 cli/services/processors-filters-siddhi/docker-compose.yml   |  9 ++++-----
 cli/services/processors-geo-flink/docker-compose.yml        |  7 +++----
 cli/services/processors-geo-jvm/docker-compose.yml          |  7 +++----
 .../processors-image-processing-jvm/docker-compose.yml      |  7 +++----
 .../processors-pattern-detection-flink/docker-compose.yml   |  7 +++----
 cli/services/processors-python/docker-compose.yml           |  4 ++--
 cli/services/processors-statistics-flink/docker-compose.yml |  7 +++----
 cli/services/processors-text-mining-jvm/docker-compose.yml  |  7 +++----
 .../processors-transformation-flink/docker-compose.yml      |  7 +++----
 .../processors-transformation-jvm/docker-compose.yml        |  7 +++----
 cli/services/rabbitmq/docker-compose.yml                    |  2 ++
 cli/services/rdf4j/docker-compose.yml                       |  4 +++-
 cli/services/sinks-brokers-jvm/docker-compose.yml           |  7 +++----
 cli/services/sinks-databases-flink/docker-compose.yml       |  7 +++----
 cli/services/sinks-databases-jvm/docker-compose.yml         |  7 +++----
 cli/services/sinks-internal-jvm/docker-compose.yml          |  9 +++------
 cli/services/sinks-notifications-jvm/docker-compose.yml     |  7 +++----
 .../sources-random-data-generator/docker-compose.yml        |  7 +++----
 cli/services/sources-vehicle-simulator/docker-compose.yml   |  7 +++----
 cli/services/sources-watertank-simulator/docker-compose.yml |  7 +++----
 cli/services/swagger-ui/docker-compose.yml                  |  2 ++
 cli/services/taskmanager/docker-compose.yml                 |  2 ++
 .../test-connect-datasources-rest/docker-compose.yml        |  2 ++
 cli/services/zookeeper/docker-compose.yml                   |  2 ++
 cli/tmpl_env                                                | 13 ++++---------
 53 files changed, 137 insertions(+), 109 deletions(-)

diff --git a/cli/services/app-container/docker-compose.yml b/cli/services/app-container/docker-compose.yml
index 80040b7..59790f6 100644
--- a/cli/services/app-container/docker-compose.yml
+++ b/cli/services/app-container/docker-compose.yml
@@ -21,6 +21,8 @@ services:
       - "3002:3000"
     volumes:
       - "../../apps:/usr/src/app/public/apps"
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}  
     networks:
       spnet:
 
diff --git a/cli/services/backend/docker-compose.yml b/cli/services/backend/docker-compose.yml
index c96bdb4..f12e8f2 100644
--- a/cli/services/backend/docker-compose.yml
+++ b/cli/services/backend/docker-compose.yml
@@ -16,14 +16,14 @@
 version: "2"
 services:
   backend:
-    image: ${SP_DOCKER_REGISTRY}streampipes/ce/backend:${SP_BACKEND_VERSION}
+    image: ${SP_DOCKER_REGISTRY}backend:${SP_BACKEND_VERSION}
     depends_on:
       - consul
       - couchdb
     ports:
       - "8030:8030"
-    environment:
-      - SP_KAFKA_HOST=${SP_KAFKA_HOST}
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}  
     volumes:
       - backend:/root/.streampipes
     networks:
diff --git a/cli/services/connect-master/docker-compose.yml b/cli/services/connect-master/docker-compose.yml
index 26c1bcf..1d89102 100644
--- a/cli/services/connect-master/docker-compose.yml
+++ b/cli/services/connect-master/docker-compose.yml
@@ -16,7 +16,7 @@
 version: "2"
 services:
   connect-master:
-    image: ${SP_DOCKER_REGISTRY}streampipes/ce/streampipes-connect-container:${SP_BACKEND_VERSION}
+    image: ${SP_DOCKER_REGISTRY}streampipes-connect-container:${SP_BACKEND_VERSION}
     depends_on:
       - consul
       - couchdb
@@ -25,9 +25,10 @@ services:
     environment:
       - EXECUTION_MODE=MASTER
       - SP_CONNECT_CONTAINER_MASTER_HOST=connect-master
-      - SP_KAFKA_HOST=${SP_KAFKA_HOST}
     volumes:
       - connect:/data/
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/connect-worker-main/docker-compose.yml b/cli/services/connect-worker-main/docker-compose.yml
index 4a4cff0..d88271e 100644
--- a/cli/services/connect-worker-main/docker-compose.yml
+++ b/cli/services/connect-worker-main/docker-compose.yml
@@ -16,7 +16,7 @@
 version: "2"
 services:
   connect-worker-main:
-    image: ${SP_DOCKER_REGISTRY}streampipes/streampipes-connect-adapters/streampipes-connect-worker:${SP_BACKEND_VERSION}
+    image: ${SP_DOCKER_REGISTRY}streampipes-connect-worker:${SP_BACKEND_VERSION}
     depends_on:
       - consul
       - couchdb
@@ -25,9 +25,10 @@ services:
     environment:
       - SP_CONNECT_CONTAINER_MASTER_HOST=connect-master
       - SP_CONNECT_CONTAINER_WORKER_HOST=connect-worker-main
-      - SP_KAFKA_HOST=${SP_KAFKA_HOST}
     volumes:
       - connect:/data/
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/consul/docker-compose.yml b/cli/services/consul/docker-compose.yml
index c3016f5..12ebb4b 100644
--- a/cli/services/consul/docker-compose.yml
+++ b/cli/services/consul/docker-compose.yml
@@ -34,6 +34,8 @@ services:
       - -ui
     volumes:
       - consul:/consul/data
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     ports:
       - "8500:8500"
       - "8600:8600"
diff --git a/cli/services/couchdb/docker-compose.yml b/cli/services/couchdb/docker-compose.yml
index 04678a9..65271d6 100644
--- a/cli/services/couchdb/docker-compose.yml
+++ b/cli/services/couchdb/docker-compose.yml
@@ -21,6 +21,8 @@ services:
       - "5984:5984"
     volumes:
       - couchdb:/opt/couchdb/data
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/crate/docker-compose.yml b/cli/services/crate/docker-compose.yml
index 1d0094c..e1a30c0 100644
--- a/cli/services/crate/docker-compose.yml
+++ b/cli/services/crate/docker-compose.yml
@@ -24,6 +24,8 @@ services:
 #      - 5432:5432 # psql port
     environment:
       CREATE_HEAP_SIZE: 2g
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/elasticsearch/docker-compose.yml b/cli/services/elasticsearch/docker-compose.yml
index 53daa69..dfe4be5 100644
--- a/cli/services/elasticsearch/docker-compose.yml
+++ b/cli/services/elasticsearch/docker-compose.yml
@@ -31,6 +31,8 @@ services:
         hard: -1
     volumes:
       - elastic:/usr/share/elasticsearch/data
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/filebeat/docker-compose.yml b/cli/services/filebeat/docker-compose.yml
index 492cf31..6f57e7f 100644
--- a/cli/services/filebeat/docker-compose.yml
+++ b/cli/services/filebeat/docker-compose.yml
@@ -22,6 +22,8 @@ services:
       - filebeat:/usr/share/filebeats/data
       - /var/run/docker.sock:/var/run/docker.sock
       - /var/lib/docker/containers:/hostfs/var/lib/docker/containers
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/grafana/docker-compose.yml b/cli/services/grafana/docker-compose.yml
index 5d49990..b72bcdf 100644
--- a/cli/services/grafana/docker-compose.yml
+++ b/cli/services/grafana/docker-compose.yml
@@ -21,6 +21,8 @@ services:
       - "3000:3000"
     volumes:
       - grafana:/var/lib/grafana
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/influxdb/docker-compose.yml b/cli/services/influxdb/docker-compose.yml
index f857a16..8820c74 100644
--- a/cli/services/influxdb/docker-compose.yml
+++ b/cli/services/influxdb/docker-compose.yml
@@ -29,6 +29,8 @@ services:
       # Data persistency
       # sudo mkdir -p /srv/docker/influxdb/data
       - influx:/var/lib/influxdb
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/iotdb/docker-compose.yml b/cli/services/iotdb/docker-compose.yml
index a45f544..3744a3e 100644
--- a/cli/services/iotdb/docker-compose.yml
+++ b/cli/services/iotdb/docker-compose.yml
@@ -21,6 +21,8 @@ services:
       - iotdb:/iotdb/data
     ports:
       - 6667:6667
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/jobmanager/docker-compose.yml b/cli/services/jobmanager/docker-compose.yml
index 014cb46..83f3f5c 100644
--- a/cli/services/jobmanager/docker-compose.yml
+++ b/cli/services/jobmanager/docker-compose.yml
@@ -23,6 +23,8 @@ services:
     command: jobmanager
     environment:
       - JOB_MANAGER_RPC_ADDRESS=jobmanager
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/kafka-rest/docker-compose.yml b/cli/services/kafka-rest/docker-compose.yml
index 60448ad..64ffc05 100644
--- a/cli/services/kafka-rest/docker-compose.yml
+++ b/cli/services/kafka-rest/docker-compose.yml
@@ -25,6 +25,8 @@ services:
       - ZK_CONNECTION_STRING=zookeeper:2181
       - KAFKA_REST_HOST_NAME=kafka-rest
       - KAFKA_REST_ZOOKEEPER_CONNECT=zookeeper:2181
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/kafka/docker-compose.yml b/cli/services/kafka/docker-compose.yml
index c8e036b..8d6832a 100644
--- a/cli/services/kafka/docker-compose.yml
+++ b/cli/services/kafka/docker-compose.yml
@@ -32,9 +32,9 @@ services:
       #
       #
       # see: https://github.com/confluentinc/schema-registry/issues/648
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,OUTSIDE:PLAINTEXT,EXTERNAL:PLAINTEXT
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://:9092,OUTSIDE://localhost:9094,EXTERNAL://ipe-girlitz.fzi.de:9095
#(local, i.e. Single-Node with IDE + Docker)
-      KAFKA_LISTENERS: PLAINTEXT://:9092,OUTSIDE://:9094,EXTERNAL://:9095
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,OUTSIDE:PLAINTEXT
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://:9092,OUTSIDE://localhost:9094 #(local, i.e.
Single-Node with IDE + Docker)
+      KAFKA_LISTENERS: PLAINTEXT://:9092,OUTSIDE://:9094
       KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
       KAFKA_ADVERTISED_HOST_NAME: kafka
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
@@ -44,6 +44,8 @@ services:
     volumes:
       - kafka:/kafka
       - /var/run/docker.sock:/var/run/docker.sock
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/kibana/docker-compose.yml b/cli/services/kibana/docker-compose.yml
index c427b05..ac58b44 100644
--- a/cli/services/kibana/docker-compose.yml
+++ b/cli/services/kibana/docker-compose.yml
@@ -22,6 +22,8 @@ services:
       ELASTICSEARCH_URL: http://elasticsearch:9200
     ports:
       - "5601:5601"
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/logstash/docker-compose.yml b/cli/services/logstash/docker-compose.yml
index 7f4646f..e0ea87e 100644
--- a/cli/services/logstash/docker-compose.yml
+++ b/cli/services/logstash/docker-compose.yml
@@ -21,6 +21,8 @@ services:
       - kafka
     ports:
       - "5044:5044"
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/mariadb/docker-compose.yml b/cli/services/mariadb/docker-compose.yml
index bd50e7d..6b59c45 100644
--- a/cli/services/mariadb/docker-compose.yml
+++ b/cli/services/mariadb/docker-compose.yml
@@ -25,6 +25,8 @@ services:
       MYSQL_USER: user1
       MYSQL_PASSWORD: 9N28_b2uhj./x-Vm
       MYSQL_ROOT_PASSWORD: uJ-ft,2CX7YD8N,P
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/mysql/docker-compose.yml b/cli/services/mysql/docker-compose.yml
index 9f18677..0cf0426 100644
--- a/cli/services/mysql/docker-compose.yml
+++ b/cli/services/mysql/docker-compose.yml
@@ -25,6 +25,8 @@ services:
       MYSQL_USER: user1
       MYSQL_PASSWORD: uY-F8c5)(!{H?EE}
       MYSQL_ROOT_PASSWORD: 7u*4rAy<rPh!v6@5
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/nginx/docker-compose.yml b/cli/services/nginx/docker-compose.yml
index 345a844..8ccd77b 100644
--- a/cli/services/nginx/docker-compose.yml
+++ b/cli/services/nginx/docker-compose.yml
@@ -25,6 +25,8 @@ services:
       - consul
       - connect-master
       - backend
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/opcua/docker-compose.yml b/cli/services/opcua/docker-compose.yml
index d807837..3faf0d7 100644
--- a/cli/services/opcua/docker-compose.yml
+++ b/cli/services/opcua/docker-compose.yml
@@ -21,6 +21,8 @@ services:
       - ./config-generated/:/appdata
     ports:
       - 50000:50000
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/pgadmin/docker-compose.yml b/cli/services/pgadmin/docker-compose.yml
index 06663cd..5281790 100644
--- a/cli/services/pgadmin/docker-compose.yml
+++ b/cli/services/pgadmin/docker-compose.yml
@@ -25,6 +25,8 @@ services:
     environment:
       PGADMIN_DEFAULT_EMAIL: user1
       PGADMIN_DEFAULT_PASSWORD: ")d,?C3?G7y[@V6}
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/phpmyadmin/docker-compose.yml b/cli/services/phpmyadmin/docker-compose.yml
index 2286569..a704abf 100644
--- a/cli/services/phpmyadmin/docker-compose.yml
+++ b/cli/services/phpmyadmin/docker-compose.yml
@@ -21,5 +21,7 @@ services:
       - 8050:80
     environment:
       PMA_ARBITRARY: 1
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
diff --git a/cli/services/pipeline-elements-all-jvm/docker-compose.yml b/cli/services/pipeline-elements-all-jvm/docker-compose.yml
index 08b7272..9df6f5a 100644
--- a/cli/services/pipeline-elements-all-jvm/docker-compose.yml
+++ b/cli/services/pipeline-elements-all-jvm/docker-compose.yml
@@ -16,14 +16,13 @@
 version: "2"
 services:
   pipeline-elements-all-jvm:
-    image: ${SP_PE_DOCKER_REGISTRY}pipeline-elements-all-jvm:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}pipeline-elements-all-jvm:${SP_PE_VERSION}
     depends_on:
       - "consul"
 #    ports:
 #      - "8098:8090"
-    environment:
-      - SP_ICON_HOST=${SP_ICON_HOST}
-      - SP_KAFKA_HOST=${SP_KAFKA_HOST}
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/postgres/docker-compose.yml b/cli/services/postgres/docker-compose.yml
index 989dbe4..b227f69 100644
--- a/cli/services/postgres/docker-compose.yml
+++ b/cli/services/postgres/docker-compose.yml
@@ -24,6 +24,8 @@ services:
     environment:
        POSTGRES_USER: user1
        POSTGRES_PASSWORD: bQgu"FUR_VH6z>~j
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/processors-aggregation-flink/docker-compose.yml b/cli/services/processors-aggregation-flink/docker-compose.yml
index 22daf27..5688d96 100644
--- a/cli/services/processors-aggregation-flink/docker-compose.yml
+++ b/cli/services/processors-aggregation-flink/docker-compose.yml
@@ -16,14 +16,13 @@
 version: "2"
 services:
   processors-aggregation-flink:
-    image: ${SP_PE_DOCKER_REGISTRY}processors-aggregation-flink:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}processors-aggregation-flink:${SP_PE_VERSION}
     depends_on:
       - "consul"
 #    ports:
 #      - "8098:8090"
-    environment:
-      - SP_ICON_HOST=${SP_ICON_HOST}
-      - SP_KAFKA_HOST=${SP_KAFKA_HOST}
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/processors-enricher-flink/docker-compose.yml b/cli/services/processors-enricher-flink/docker-compose.yml
index 85bbe3b..ca32af3 100644
--- a/cli/services/processors-enricher-flink/docker-compose.yml
+++ b/cli/services/processors-enricher-flink/docker-compose.yml
@@ -16,14 +16,13 @@
 version: "2"
 services:
   processors-enricher-flink:
-    image: ${SP_PE_DOCKER_REGISTRY}processors-enricher-flink:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}processors-enricher-flink:${SP_PE_VERSION}
     depends_on:
       - "consul"
 #    ports:
 #      - "8098:8090"
-    environment:
-      - SP_ICON_HOST=${SP_ICON_HOST}
-      - SP_KAFKA_HOST=${SP_KAFKA_HOST}
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/processors-filters-jvm/docker-compose.yml b/cli/services/processors-filters-jvm/docker-compose.yml
index 13d8457..14aba5c 100644
--- a/cli/services/processors-filters-jvm/docker-compose.yml
+++ b/cli/services/processors-filters-jvm/docker-compose.yml
@@ -16,14 +16,13 @@
 version: "2"
 services:
   processors-filters-jvm:
-    image: ${SP_PE_DOCKER_REGISTRY}processors-filters-jvm:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}processors-filters-jvm:${SP_PE_VERSION}
     depends_on:
       - "consul"
 #    ports:
 #      - "8098:8090"
-    environment:
-      - SP_ICON_HOST=${SP_ICON_HOST}
-      - SP_KAFKA_HOST=${SP_KAFKA_HOST}
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/processors-filters-siddhi/docker-compose.yml b/cli/services/processors-filters-siddhi/docker-compose.yml
index 1ef8e5e..135d6c9 100644
--- a/cli/services/processors-filters-siddhi/docker-compose.yml
+++ b/cli/services/processors-filters-siddhi/docker-compose.yml
@@ -16,17 +16,16 @@
 version: "2"
 services:
   processors-filters-siddhi:
-    image: ${SP_PE_DOCKER_REGISTRY}processors-filters-siddhi:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}processors-filters-siddhi:${SP_PE_VERSION}
     depends_on:
       - "consul"
 #    ports:
 #      - "8098:8090"
-    environment:
-      - SP_ICON_HOST=${SP_ICON_HOST}
-      - SP_KAFKA_HOST=${SP_KAFKA_HOST}
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
 networks:
   spnet:
-    external: true
\ No newline at end of file
+    external: true
diff --git a/cli/services/processors-geo-flink/docker-compose.yml b/cli/services/processors-geo-flink/docker-compose.yml
index 009d3e9..dd17f14 100644
--- a/cli/services/processors-geo-flink/docker-compose.yml
+++ b/cli/services/processors-geo-flink/docker-compose.yml
@@ -16,14 +16,13 @@
 version: "2"
 services:
   processors-geo-flink:
-    image: ${SP_PE_DOCKER_REGISTRY}processors-geo-flink:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}processors-geo-flink:${SP_PE_VERSION}
     depends_on:
       - "consul"
 #    ports:
 #      - "8098:8090"
-    environment:
-      - SP_ICON_HOST=${SP_ICON_HOST}
-      - SP_KAFKA_HOST=${SP_KAFKA_HOST}
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/processors-geo-jvm/docker-compose.yml b/cli/services/processors-geo-jvm/docker-compose.yml
index 1105ccb..a36d6e8 100644
--- a/cli/services/processors-geo-jvm/docker-compose.yml
+++ b/cli/services/processors-geo-jvm/docker-compose.yml
@@ -16,14 +16,13 @@
 version: "2"
 services:
   processors-geo-jvm:
-    image: ${SP_PE_DOCKER_REGISTRY}processors-geo-jvm:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}processors-geo-jvm:${SP_PE_VERSION}
     depends_on:
       - "consul"
 #    ports:
 #      - "8098:8090"
-    environment:
-      - SP_ICON_HOST=${SP_ICON_HOST}
-      - SP_KAFKA_HOST=${SP_KAFKA_HOST}
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/processors-image-processing-jvm/docker-compose.yml b/cli/services/processors-image-processing-jvm/docker-compose.yml
index 2ca2d9b..ffaaee9 100644
--- a/cli/services/processors-image-processing-jvm/docker-compose.yml
+++ b/cli/services/processors-image-processing-jvm/docker-compose.yml
@@ -16,14 +16,13 @@
 version: "2"
 services:
   processors-image-processing-jvm:
-    image: ${SP_PE_DOCKER_REGISTRY}processors-image-processing-jvm:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}processors-image-processing-jvm:${SP_PE_VERSION}
     depends_on:
       - "consul"
 #    ports:
 #      - "8098:8090"
-    environment:
-      - SP_ICON_HOST=${SP_ICON_HOST}
-      - SP_KAFKA_HOST=${SP_KAFKA_HOST}
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/processors-pattern-detection-flink/docker-compose.yml b/cli/services/processors-pattern-detection-flink/docker-compose.yml
index 22238dc..6e52c96 100644
--- a/cli/services/processors-pattern-detection-flink/docker-compose.yml
+++ b/cli/services/processors-pattern-detection-flink/docker-compose.yml
@@ -16,14 +16,13 @@
 version: "2"
 services:
   processors-pattern-detection-flink:
-    image: ${SP_PE_DOCKER_REGISTRY}processors-pattern-detection-flink:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}processors-pattern-detection-flink:${SP_PE_VERSION}
     depends_on:
       - "consul"
 #    ports:
 #      - "8098:8090"
-    environment:
-      - SP_ICON_HOST=${SP_ICON_HOST}
-      - SP_KAFKA_HOST=${SP_KAFKA_HOST}
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/processors-python/docker-compose.yml b/cli/services/processors-python/docker-compose.yml
index 693acd1..1fa8589 100644
--- a/cli/services/processors-python/docker-compose.yml
+++ b/cli/services/processors-python/docker-compose.yml
@@ -21,7 +21,7 @@ services:
       - "consul"
 #    ports:
 #      - "8098:8090"
-    environment:
-      - SP_ICON_HOST=${SP_ICON_HOST}
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
diff --git a/cli/services/processors-statistics-flink/docker-compose.yml b/cli/services/processors-statistics-flink/docker-compose.yml
index 914a1c5..996109a 100644
--- a/cli/services/processors-statistics-flink/docker-compose.yml
+++ b/cli/services/processors-statistics-flink/docker-compose.yml
@@ -16,14 +16,13 @@
 version: "2"
 services:
   processors-statistics-flink:
-    image: ${SP_PE_DOCKER_REGISTRY}processors-statistics-flink:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}processors-statistics-flink:${SP_PE_VERSION}
     depends_on:
       - "consul"
 #    ports:
 #      - "8098:8090"
-    environment:
-      - SP_ICON_HOST=${SP_ICON_HOST}
-      - SP_KAFKA_HOST=${SP_KAFKA_HOST}
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/processors-text-mining-jvm/docker-compose.yml b/cli/services/processors-text-mining-jvm/docker-compose.yml
index 9905b23..7c5de12 100644
--- a/cli/services/processors-text-mining-jvm/docker-compose.yml
+++ b/cli/services/processors-text-mining-jvm/docker-compose.yml
@@ -16,16 +16,15 @@
 version: "2"
 services:
   processors-text-mining-jvm:
-    image: ${SP_PE_DOCKER_REGISTRY}processors-text-mining-jvm:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}processors-text-mining-jvm:${SP_PE_VERSION}
     depends_on:
       - "consul"
     volumes:
       - ./config/models:/data/models
     ports:
       - "8090:8090"
-    environment:
-      - SP_ICON_HOST=${SP_ICON_HOST}
-      - SP_KAFKA_HOST=${SP_KAFKA_HOST}
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/processors-transformation-flink/docker-compose.yml b/cli/services/processors-transformation-flink/docker-compose.yml
index 274f026..12a7db0 100644
--- a/cli/services/processors-transformation-flink/docker-compose.yml
+++ b/cli/services/processors-transformation-flink/docker-compose.yml
@@ -16,14 +16,13 @@
 version: "2"
 services:
   processors-transformation-flink:
-    image: ${SP_PE_DOCKER_REGISTRY}processors-transformation-flink:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}processors-transformation-flink:${SP_PE_VERSION}
     depends_on:
       - "consul"
 #    ports:
 #      - "8098:8090"
-    environment:
-      - SP_ICON_HOST=${SP_ICON_HOST}
-      - SP_KAFKA_HOST=${SP_KAFKA_HOST}
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/processors-transformation-jvm/docker-compose.yml b/cli/services/processors-transformation-jvm/docker-compose.yml
index e3bc541..550c617 100644
--- a/cli/services/processors-transformation-jvm/docker-compose.yml
+++ b/cli/services/processors-transformation-jvm/docker-compose.yml
@@ -16,14 +16,13 @@
 version: "2"
 services:
   processors-transformation-jvm:
-    image: ${SP_PE_DOCKER_REGISTRY}processors-transformation-jvm:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}processors-transformation-jvm:${SP_PE_VERSION}
     depends_on:
       - "consul"
 #    ports:
 #      - "8098:8090"
-    environment:
-      - SP_ICON_HOST=${SP_ICON_HOST}
-      - SP_KAFKA_HOST=${SP_KAFKA_HOST}
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/rabbitmq/docker-compose.yml b/cli/services/rabbitmq/docker-compose.yml
index c8436d3..cd3dcf6 100644
--- a/cli/services/rabbitmq/docker-compose.yml
+++ b/cli/services/rabbitmq/docker-compose.yml
@@ -22,6 +22,8 @@ services:
       - "5672:5672"
     volumes:
       - ./services/rabbittmq/rabbitmq-isolated.conf:/etc/rabbitmq/rabbitmq.config
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/rdf4j/docker-compose.yml b/cli/services/rdf4j/docker-compose.yml
index c42e778..ee798aa 100644
--- a/cli/services/rdf4j/docker-compose.yml
+++ b/cli/services/rdf4j/docker-compose.yml
@@ -21,6 +21,8 @@ services:
       - "8031:8031"
     volumes:
       - rdf4j:/root/.RDF4J
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
@@ -29,4 +31,4 @@ volumes:
 
 networks:
   spnet:
-    external: true
\ No newline at end of file
+    external: true
diff --git a/cli/services/sinks-brokers-jvm/docker-compose.yml b/cli/services/sinks-brokers-jvm/docker-compose.yml
index 8b95f28..66f50c2 100644
--- a/cli/services/sinks-brokers-jvm/docker-compose.yml
+++ b/cli/services/sinks-brokers-jvm/docker-compose.yml
@@ -16,14 +16,13 @@
 version: "2"
 services:
   sinks-brokers-jvm:
-    image: ${SP_PE_DOCKER_REGISTRY}sinks-brokers-jvm:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}sinks-brokers-jvm:${SP_PE_VERSION}
     depends_on:
       - "consul"
 #    ports:
 #      - "8098:8090"
-    environment:
-      - SP_ICON_HOST=${SP_ICON_HOST}
-      - SP_KAFKA_HOST=${SP_KAFKA_HOST}
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/sinks-databases-flink/docker-compose.yml b/cli/services/sinks-databases-flink/docker-compose.yml
index dc60425..603c8cc 100644
--- a/cli/services/sinks-databases-flink/docker-compose.yml
+++ b/cli/services/sinks-databases-flink/docker-compose.yml
@@ -16,14 +16,13 @@
 version: "2"
 services:
   sinks-databases-flink:
-    image: ${SP_PE_DOCKER_REGISTRY}sinks-databases-flink:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}sinks-databases-flink:${SP_PE_VERSION}
     depends_on:
       - "consul"
 #    ports:
 #      - "8098:8090"
-    environment:
-      - SP_ICON_HOST=${SP_ICON_HOST}
-      - SP_KAFKA_HOST=${SP_KAFKA_HOST}
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/sinks-databases-jvm/docker-compose.yml b/cli/services/sinks-databases-jvm/docker-compose.yml
index fb1adec..40fe4bc 100644
--- a/cli/services/sinks-databases-jvm/docker-compose.yml
+++ b/cli/services/sinks-databases-jvm/docker-compose.yml
@@ -16,14 +16,13 @@
 version: "2"
 services:
   sinks-databases-jvm:
-    image: ${SP_PE_DOCKER_REGISTRY}sinks-databases-jvm:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}sinks-databases-jvm:${SP_PE_VERSION}
     depends_on:
       - "consul"
 #    ports:
 #      - "8098:8090"
-    environment:
-      - SP_ICON_HOST=${SP_ICON_HOST}
-      - SP_KAFKA_HOST=${SP_KAFKA_HOST}
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/sinks-internal-jvm/docker-compose.yml b/cli/services/sinks-internal-jvm/docker-compose.yml
index ad4aaef..0dc1a91 100644
--- a/cli/services/sinks-internal-jvm/docker-compose.yml
+++ b/cli/services/sinks-internal-jvm/docker-compose.yml
@@ -16,16 +16,13 @@
 version: "2"
 services:
   sinks-internal-jvm:
-    image: ${SP_PE_DOCKER_REGISTRY}sinks-internal-jvm:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}sinks-internal-jvm:${SP_PE_VERSION}
     depends_on:
       - "consul"
 #    ports:
 #      - "8098:8090"
-    environment:
-      - STREAMPIPES_HOST=${SP_HOST}
-      - SP_ICON_HOST=${SP_HOST}
-      - SP_NGINX_HOST=${SP_HOST}
-      - SP_KAFKA_HOST=${SP_KAFKA_HOST}
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/sinks-notifications-jvm/docker-compose.yml b/cli/services/sinks-notifications-jvm/docker-compose.yml
index 57df0eb..f34fbb2 100644
--- a/cli/services/sinks-notifications-jvm/docker-compose.yml
+++ b/cli/services/sinks-notifications-jvm/docker-compose.yml
@@ -16,14 +16,13 @@
 version: "2"
 services:
   sinks-notifications-jvm:
-    image: ${SP_PE_DOCKER_REGISTRY}sinks-notifications-jvm:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}sinks-notifications-jvm:${SP_PE_VERSION}
     depends_on:
       - "consul"
 #    ports:
 #      - "8098:8090"
-    environment:
-      - SP_ICON_HOST=${SP_ICON_HOST}
-      - SP_KAFKA_HOST=${SP_KAFKA_HOST}
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/sources-random-data-generator/docker-compose.yml b/cli/services/sources-random-data-generator/docker-compose.yml
index cd53a52..2f6ad3a 100644
--- a/cli/services/sources-random-data-generator/docker-compose.yml
+++ b/cli/services/sources-random-data-generator/docker-compose.yml
@@ -16,14 +16,13 @@
 version: "2"
 services:
   sources-random-data-generator:
-    image: ${SP_PE_DOCKER_REGISTRY}sources-random-data-generator:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}sources-random-data-generator:${SP_PE_VERSION}
     depends_on:
       - "consul"
 #    ports:
 #      - "8098:8090"
-    environment:
-      - SP_ICON_HOST=${SP_ICON_HOST}
-      - SP_KAFKA_HOST=${SP_KAFKA_HOST}
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/sources-vehicle-simulator/docker-compose.yml b/cli/services/sources-vehicle-simulator/docker-compose.yml
index 64063bd..d4923e5 100644
--- a/cli/services/sources-vehicle-simulator/docker-compose.yml
+++ b/cli/services/sources-vehicle-simulator/docker-compose.yml
@@ -16,14 +16,13 @@
 version: "2"
 services:
   sources-vehicle-simulator:
-    image: ${SP_PE_DOCKER_REGISTRY}sources-vehicle-simulator:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}sources-vehicle-simulator:${SP_PE_VERSION}
     depends_on:
       - "consul"
 #    ports:
 #      - "8098:8090"
-    environment:
-      - SP_ICON_HOST=${SP_ICON_HOST}
-      - SP_KAFKA_HOST=${SP_KAFKA_HOST}
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/sources-watertank-simulator/docker-compose.yml b/cli/services/sources-watertank-simulator/docker-compose.yml
index ead6e9d..15a1c12 100644
--- a/cli/services/sources-watertank-simulator/docker-compose.yml
+++ b/cli/services/sources-watertank-simulator/docker-compose.yml
@@ -16,14 +16,13 @@
 version: "2"
 services:
   sources-watertank-simulator:
-    image: ${SP_PE_DOCKER_REGISTRY}sources-watertank-simulator:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}sources-watertank-simulator:${SP_PE_VERSION}
     depends_on:
       - "consul"
 #    ports:
 #      - "8098:8090"
-    environment:
-      - SP_ICON_HOST=${SP_ICON_HOST}
-      - SP_KAFKA_HOST=kafka
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/swagger-ui/docker-compose.yml b/cli/services/swagger-ui/docker-compose.yml
index 7ab83e4..cdc8a3d 100644
--- a/cli/services/swagger-ui/docker-compose.yml
+++ b/cli/services/swagger-ui/docker-compose.yml
@@ -21,6 +21,8 @@ services:
       - "8080:8080"
     environment:
       - "API_URL=http://${SP_HOST}/streampipes-backend/api/docs/swagger.json"
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/taskmanager/docker-compose.yml b/cli/services/taskmanager/docker-compose.yml
index a7289a4..84f478f 100644
--- a/cli/services/taskmanager/docker-compose.yml
+++ b/cli/services/taskmanager/docker-compose.yml
@@ -25,6 +25,8 @@ services:
     environment:
       - JOB_MANAGER_RPC_ADDRESS=jobmanager
       - TASK_MANAGER_NUMBER_OF_TASK_SLOTS=20
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/test-connect-datasources-rest/docker-compose.yml b/cli/services/test-connect-datasources-rest/docker-compose.yml
index 7b1df64..b499547 100644
--- a/cli/services/test-connect-datasources-rest/docker-compose.yml
+++ b/cli/services/test-connect-datasources-rest/docker-compose.yml
@@ -19,6 +19,8 @@ services:
     image: ${SP_DOCKER_REGISTRY}streampipes/streampipes-connect-datasources-for-testing/master
     ports:
       - "3001:3001"
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/services/zookeeper/docker-compose.yml b/cli/services/zookeeper/docker-compose.yml
index f924a46..79888ad 100644
--- a/cli/services/zookeeper/docker-compose.yml
+++ b/cli/services/zookeeper/docker-compose.yml
@@ -22,6 +22,8 @@ services:
     volumes:
       - zk-conf:/opt/zookeeper-3.4.13/conf
       - zk-data:/opt/zookeeper-3.4.13/data
+    extra_hosts:
+      - host.docker.internal:${HOST_DOCKER_INTERNAL}
     networks:
       spnet:
 
diff --git a/cli/tmpl_env b/cli/tmpl_env
index 0e48c2b..f3fa484 100644
--- a/cli/tmpl_env
+++ b/cli/tmpl_env
@@ -1,9 +1,4 @@
-SP_HOST=##IP##
-SP_ICON_HOST=##IP##
-SP_DOCKER_REGISTRY=ipe-wim-gitlab.fzi.de:5000/
-SP_PE_DOCKER_REGISTRY=ipe-wim-gitlab.fzi.de:5000/streampipes/streampipes-pipeline-elements/
-SP_INTERNAL_PE_DOCKER_REGISTRY=ipe-wim-gitlab.fzi.de:5000/streampipes/streampipes-pipeline-elements-internal/
-SP_BACKEND_VERSION=0.64.1-SNAPSHOT
-SP_PE_VERSION=0.64.1-SNAPSHOT
-SP_KAFKA_HOST=##IP##
-
+SP_DOCKER_REGISTRY=streampipes/
+SP_BACKEND_VERSION=0.65.0
+SP_PE_VERSION=0.65.0
+HOST_DOCKER_INTERNAL=##HOST_DOCKER_INTERNAL##


Mime
View raw message