You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by wi...@apache.org on 2020/08/24 05:43:44 UTC
[incubator-streampipes-installer] branch dev updated: [STREAMPIPES-196] switch to SP_VERSION

This is an automated email from the ASF dual-hosted git repository.

wiener 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 7eb736d  [STREAMPIPES-196] switch to SP_VERSION
7eb736d is described below

commit 7eb736dadb54cdaaab1f0770062c5a157efcd30b
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Mon Aug 24 07:42:19 2020 +0200

    [STREAMPIPES-196] switch to SP_VERSION
---
 cli/bin/templates/env.template                                         | 3 +--
 cli/deploy/standalone/backend/docker-compose.yml                       | 2 +-
 cli/deploy/standalone/connect-master/docker-compose.yml                | 2 +-
 cli/deploy/standalone/connect-worker-main/docker-compose.yml           | 2 +-
 cli/deploy/standalone/pipeline-elements-all-jvm/docker-compose.yml     | 2 +-
 cli/deploy/standalone/processors-aggregation-flink/docker-compose.yml  | 2 +-
 cli/deploy/standalone/processors-enricher-flink/docker-compose.yml     | 2 +-
 cli/deploy/standalone/processors-enricher-jvm/docker-compose.yml       | 2 +-
 cli/deploy/standalone/processors-filters-jvm/docker-compose.yml        | 2 +-
 cli/deploy/standalone/processors-filters-siddhi/docker-compose.yml     | 2 +-
 cli/deploy/standalone/processors-geo-flink/docker-compose.yml          | 2 +-
 cli/deploy/standalone/processors-geo-jvm/docker-compose.yml            | 2 +-
 .../standalone/processors-image-processing-jvm/docker-compose.yml      | 2 +-
 .../standalone/processors-pattern-detection-flink/docker-compose.yml   | 2 +-
 cli/deploy/standalone/processors-statistics-flink/docker-compose.yml   | 2 +-
 cli/deploy/standalone/processors-text-mining-jvm/docker-compose.yml    | 2 +-
 .../standalone/processors-transformation-flink/docker-compose.yml      | 2 +-
 cli/deploy/standalone/processors-transformation-jvm/docker-compose.yml | 2 +-
 cli/deploy/standalone/sinks-brokers-jvm/docker-compose.yml             | 2 +-
 cli/deploy/standalone/sinks-databases-flink/docker-compose.yml         | 2 +-
 cli/deploy/standalone/sinks-databases-jvm/docker-compose.yml           | 2 +-
 cli/deploy/standalone/sinks-internal-jvm/docker-compose.yml            | 2 +-
 cli/deploy/standalone/sinks-notifications-jvm/docker-compose.yml       | 2 +-
 cli/deploy/standalone/sources-vehicle-simulator/docker-compose.yml     | 2 +-
 cli/deploy/standalone/sources-watertank-simulator/docker-compose.yml   | 2 +-
 cli/deploy/standalone/ui/docker-compose.yml                            | 2 +-
 26 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/cli/bin/templates/env.template b/cli/bin/templates/env.template
index edf8fd4..3d6841a 100644
--- a/cli/bin/templates/env.template
+++ b/cli/bin/templates/env.template
@@ -14,8 +14,7 @@
 # limitations under the License.
 
 SP_DOCKER_REGISTRY=apachestreampipes/
-SP_BACKEND_VERSION=##VERSION##
-SP_PE_VERSION=##VERSION##
+SP_VERSION=##VERSION##
 SP_SUBNET=172.31.0.0/16
 SP_CONSUL_CONTAINER_IP=172.31.0.9
 COMPOSE_PROJECT_NAME=streampipes
diff --git a/cli/deploy/standalone/backend/docker-compose.yml b/cli/deploy/standalone/backend/docker-compose.yml
index d105da3..9a427b6 100644
--- a/cli/deploy/standalone/backend/docker-compose.yml
+++ b/cli/deploy/standalone/backend/docker-compose.yml
@@ -16,7 +16,7 @@
 version: "3.4"
 services:
   backend:
-    image: ${SP_DOCKER_REGISTRY}backend:${SP_BACKEND_VERSION}
+    image: ${SP_DOCKER_REGISTRY}backend:${SP_VERSION}
     depends_on:
       - consul
       - couchdb
diff --git a/cli/deploy/standalone/connect-master/docker-compose.yml b/cli/deploy/standalone/connect-master/docker-compose.yml
index 51d38cd..0123671 100644
--- a/cli/deploy/standalone/connect-master/docker-compose.yml
+++ b/cli/deploy/standalone/connect-master/docker-compose.yml
@@ -16,7 +16,7 @@
 version: "3.4"
 services:
   connect-master:
-    image: ${SP_DOCKER_REGISTRY}streampipes-connect-container:${SP_BACKEND_VERSION}
+    image: ${SP_DOCKER_REGISTRY}streampipes-connect-container:${SP_VERSION}
     depends_on:
       - consul
       - couchdb
diff --git a/cli/deploy/standalone/connect-worker-main/docker-compose.yml b/cli/deploy/standalone/connect-worker-main/docker-compose.yml
index 02fb4da..c1a5134 100644
--- a/cli/deploy/standalone/connect-worker-main/docker-compose.yml
+++ b/cli/deploy/standalone/connect-worker-main/docker-compose.yml
@@ -16,7 +16,7 @@
 version: "3.4"
 services:
   connect-worker-main:
-    image: ${SP_DOCKER_REGISTRY}connect-worker:${SP_BACKEND_VERSION}
+    image: ${SP_DOCKER_REGISTRY}connect-worker:${SP_VERSION}
     depends_on:
       - consul
       - couchdb
diff --git a/cli/deploy/standalone/pipeline-elements-all-jvm/docker-compose.yml b/cli/deploy/standalone/pipeline-elements-all-jvm/docker-compose.yml
index ac053b7..a8077c8 100644
--- a/cli/deploy/standalone/pipeline-elements-all-jvm/docker-compose.yml
+++ b/cli/deploy/standalone/pipeline-elements-all-jvm/docker-compose.yml
@@ -16,7 +16,7 @@
 version: "3.4"
 services:
   pipeline-elements-all-jvm:
-    image: ${SP_DOCKER_REGISTRY}pipeline-elements-all-jvm:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}pipeline-elements-all-jvm:${SP_VERSION}
     depends_on:
       - "consul"
     volumes:
diff --git a/cli/deploy/standalone/processors-aggregation-flink/docker-compose.yml b/cli/deploy/standalone/processors-aggregation-flink/docker-compose.yml
index fee3388..a911370 100644
--- a/cli/deploy/standalone/processors-aggregation-flink/docker-compose.yml
+++ b/cli/deploy/standalone/processors-aggregation-flink/docker-compose.yml
@@ -16,7 +16,7 @@
 version: "3.4"
 services:
   processors-aggregation-flink:
-    image: ${SP_DOCKER_REGISTRY}processors-aggregation-flink:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}processors-aggregation-flink:${SP_VERSION}
     depends_on:
       - "consul"
       - "jobmanager"
diff --git a/cli/deploy/standalone/processors-enricher-flink/docker-compose.yml b/cli/deploy/standalone/processors-enricher-flink/docker-compose.yml
index b7dd0f6..a07b351 100644
--- a/cli/deploy/standalone/processors-enricher-flink/docker-compose.yml
+++ b/cli/deploy/standalone/processors-enricher-flink/docker-compose.yml
@@ -16,7 +16,7 @@
 version: "3.4"
 services:
   processors-enricher-flink:
-    image: ${SP_DOCKER_REGISTRY}processors-enricher-flink:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}processors-enricher-flink:${SP_VERSION}
     depends_on:
       - "consul"
       - "jobmanager"      
diff --git a/cli/deploy/standalone/processors-enricher-jvm/docker-compose.yml b/cli/deploy/standalone/processors-enricher-jvm/docker-compose.yml
index a32cec0..c717b35 100644
--- a/cli/deploy/standalone/processors-enricher-jvm/docker-compose.yml
+++ b/cli/deploy/standalone/processors-enricher-jvm/docker-compose.yml
@@ -16,7 +16,7 @@
 version: "3.4"
 services:
   processors-enricher-jvm:
-    image: ${SP_DOCKER_REGISTRY}processors-enricher-jvm:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}processors-enricher-jvm:${SP_VERSION}
     depends_on:
       - "consul"
     logging:
diff --git a/cli/deploy/standalone/processors-filters-jvm/docker-compose.yml b/cli/deploy/standalone/processors-filters-jvm/docker-compose.yml
index 2dd9ac0..d4a76a0 100644
--- a/cli/deploy/standalone/processors-filters-jvm/docker-compose.yml
+++ b/cli/deploy/standalone/processors-filters-jvm/docker-compose.yml
@@ -16,7 +16,7 @@
 version: "3.4"
 services:
   processors-filters-jvm:
-    image: ${SP_DOCKER_REGISTRY}processors-filters-jvm:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}processors-filters-jvm:${SP_VERSION}
     depends_on:
       - "consul"
     logging:
diff --git a/cli/deploy/standalone/processors-filters-siddhi/docker-compose.yml b/cli/deploy/standalone/processors-filters-siddhi/docker-compose.yml
index 6ddbb7f..aa3618a 100644
--- a/cli/deploy/standalone/processors-filters-siddhi/docker-compose.yml
+++ b/cli/deploy/standalone/processors-filters-siddhi/docker-compose.yml
@@ -16,7 +16,7 @@
 version: "3.4"
 services:
   processors-filters-siddhi:
-    image: ${SP_DOCKER_REGISTRY}processors-filters-siddhi:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}processors-filters-siddhi:${SP_VERSION}
     depends_on:
       - "consul"
     logging:
diff --git a/cli/deploy/standalone/processors-geo-flink/docker-compose.yml b/cli/deploy/standalone/processors-geo-flink/docker-compose.yml
index 4ecb379..a69b3ac 100644
--- a/cli/deploy/standalone/processors-geo-flink/docker-compose.yml
+++ b/cli/deploy/standalone/processors-geo-flink/docker-compose.yml
@@ -16,7 +16,7 @@
 version: "3.4"
 services:
   processors-geo-flink:
-    image: ${SP_DOCKER_REGISTRY}processors-geo-flink:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}processors-geo-flink:${SP_VERSION}
     depends_on:
       - "consul"
       - "jobmanager"      
diff --git a/cli/deploy/standalone/processors-geo-jvm/docker-compose.yml b/cli/deploy/standalone/processors-geo-jvm/docker-compose.yml
index e91891f..e4b23bd 100644
--- a/cli/deploy/standalone/processors-geo-jvm/docker-compose.yml
+++ b/cli/deploy/standalone/processors-geo-jvm/docker-compose.yml
@@ -16,7 +16,7 @@
 version: "3.4"
 services:
   processors-geo-jvm:
-    image: ${SP_DOCKER_REGISTRY}processors-geo-jvm:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}processors-geo-jvm:${SP_VERSION}
     depends_on:
       - "consul"
     logging:
diff --git a/cli/deploy/standalone/processors-image-processing-jvm/docker-compose.yml b/cli/deploy/standalone/processors-image-processing-jvm/docker-compose.yml
index c325857..13ee179 100644
--- a/cli/deploy/standalone/processors-image-processing-jvm/docker-compose.yml
+++ b/cli/deploy/standalone/processors-image-processing-jvm/docker-compose.yml
@@ -16,7 +16,7 @@
 version: "3.4"
 services:
   processors-image-processing-jvm:
-    image: ${SP_DOCKER_REGISTRY}processors-image-processing-jvm:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}processors-image-processing-jvm:${SP_VERSION}
     depends_on:
       - "consul"
     logging:
diff --git a/cli/deploy/standalone/processors-pattern-detection-flink/docker-compose.yml b/cli/deploy/standalone/processors-pattern-detection-flink/docker-compose.yml
index 6e6b249..b4670c5 100644
--- a/cli/deploy/standalone/processors-pattern-detection-flink/docker-compose.yml
+++ b/cli/deploy/standalone/processors-pattern-detection-flink/docker-compose.yml
@@ -16,7 +16,7 @@
 version: "3.4"
 services:
   processors-pattern-detection-flink:
-    image: ${SP_DOCKER_REGISTRY}processors-pattern-detection-flink:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}processors-pattern-detection-flink:${SP_VERSION}
     depends_on:
       - "consul"
       - "jobmanager"      
diff --git a/cli/deploy/standalone/processors-statistics-flink/docker-compose.yml b/cli/deploy/standalone/processors-statistics-flink/docker-compose.yml
index 0af3649..24a5e84 100644
--- a/cli/deploy/standalone/processors-statistics-flink/docker-compose.yml
+++ b/cli/deploy/standalone/processors-statistics-flink/docker-compose.yml
@@ -16,7 +16,7 @@
 version: "3.4"
 services:
   processors-statistics-flink:
-    image: ${SP_DOCKER_REGISTRY}processors-statistics-flink:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}processors-statistics-flink:${SP_VERSION}
     depends_on:
       - "consul"
       - "jobmanager"      
diff --git a/cli/deploy/standalone/processors-text-mining-jvm/docker-compose.yml b/cli/deploy/standalone/processors-text-mining-jvm/docker-compose.yml
index af4a86a..f4077e3 100644
--- a/cli/deploy/standalone/processors-text-mining-jvm/docker-compose.yml
+++ b/cli/deploy/standalone/processors-text-mining-jvm/docker-compose.yml
@@ -16,7 +16,7 @@
 version: "3.4"
 services:
   processors-text-mining-jvm:
-    image: ${SP_DOCKER_REGISTRY}processors-text-mining-jvm:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}processors-text-mining-jvm:${SP_VERSION}
     depends_on:
       - "consul"
     volumes:
diff --git a/cli/deploy/standalone/processors-transformation-flink/docker-compose.yml b/cli/deploy/standalone/processors-transformation-flink/docker-compose.yml
index 1afc4b5..a2e541d 100644
--- a/cli/deploy/standalone/processors-transformation-flink/docker-compose.yml
+++ b/cli/deploy/standalone/processors-transformation-flink/docker-compose.yml
@@ -16,7 +16,7 @@
 version: "3.4"
 services:
   processors-transformation-flink:
-    image: ${SP_DOCKER_REGISTRY}processors-transformation-flink:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}processors-transformation-flink:${SP_VERSION}
     depends_on:
       - "consul"
       - "jobmanager"      
diff --git a/cli/deploy/standalone/processors-transformation-jvm/docker-compose.yml b/cli/deploy/standalone/processors-transformation-jvm/docker-compose.yml
index a9dfc70..0b01c16 100644
--- a/cli/deploy/standalone/processors-transformation-jvm/docker-compose.yml
+++ b/cli/deploy/standalone/processors-transformation-jvm/docker-compose.yml
@@ -16,7 +16,7 @@
 version: "3.4"
 services:
   processors-transformation-jvm:
-    image: ${SP_DOCKER_REGISTRY}processors-transformation-jvm:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}processors-transformation-jvm:${SP_VERSION}
     depends_on:
       - "consul"
 #    ports:
diff --git a/cli/deploy/standalone/sinks-brokers-jvm/docker-compose.yml b/cli/deploy/standalone/sinks-brokers-jvm/docker-compose.yml
index d9394ce..4d38784 100644
--- a/cli/deploy/standalone/sinks-brokers-jvm/docker-compose.yml
+++ b/cli/deploy/standalone/sinks-brokers-jvm/docker-compose.yml
@@ -16,7 +16,7 @@
 version: "3.4"
 services:
   sinks-brokers-jvm:
-    image: ${SP_DOCKER_REGISTRY}sinks-brokers-jvm:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}sinks-brokers-jvm:${SP_VERSION}
     depends_on:
       - "consul"
     logging:
diff --git a/cli/deploy/standalone/sinks-databases-flink/docker-compose.yml b/cli/deploy/standalone/sinks-databases-flink/docker-compose.yml
index 90acccb..16cb4e8 100644
--- a/cli/deploy/standalone/sinks-databases-flink/docker-compose.yml
+++ b/cli/deploy/standalone/sinks-databases-flink/docker-compose.yml
@@ -16,7 +16,7 @@
 version: "3.4"
 services:
   sinks-databases-flink:
-    image: ${SP_DOCKER_REGISTRY}sinks-databases-flink:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}sinks-databases-flink:${SP_VERSION}
     depends_on:
       - "consul"
       - "jobmanager"      
diff --git a/cli/deploy/standalone/sinks-databases-jvm/docker-compose.yml b/cli/deploy/standalone/sinks-databases-jvm/docker-compose.yml
index 69b63f0..95db971 100644
--- a/cli/deploy/standalone/sinks-databases-jvm/docker-compose.yml
+++ b/cli/deploy/standalone/sinks-databases-jvm/docker-compose.yml
@@ -16,7 +16,7 @@
 version: "3.4"
 services:
   sinks-databases-jvm:
-    image: ${SP_DOCKER_REGISTRY}sinks-databases-jvm:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}sinks-databases-jvm:${SP_VERSION}
     depends_on:
       - "consul"
     logging:
diff --git a/cli/deploy/standalone/sinks-internal-jvm/docker-compose.yml b/cli/deploy/standalone/sinks-internal-jvm/docker-compose.yml
index a14ea22..0dc9e0a 100644
--- a/cli/deploy/standalone/sinks-internal-jvm/docker-compose.yml
+++ b/cli/deploy/standalone/sinks-internal-jvm/docker-compose.yml
@@ -16,7 +16,7 @@
 version: "3.4"
 services:
   sinks-internal-jvm:
-    image: ${SP_DOCKER_REGISTRY}sinks-internal-jvm:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}sinks-internal-jvm:${SP_VERSION}
     depends_on:
       - "consul"
     volumes:
diff --git a/cli/deploy/standalone/sinks-notifications-jvm/docker-compose.yml b/cli/deploy/standalone/sinks-notifications-jvm/docker-compose.yml
index 38c1562..a7a26ef 100644
--- a/cli/deploy/standalone/sinks-notifications-jvm/docker-compose.yml
+++ b/cli/deploy/standalone/sinks-notifications-jvm/docker-compose.yml
@@ -16,7 +16,7 @@
 version: "3.4"
 services:
   sinks-notifications-jvm:
-    image: ${SP_DOCKER_REGISTRY}sinks-notifications-jvm:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}sinks-notifications-jvm:${SP_VERSION}
     depends_on:
       - "consul"
     logging:
diff --git a/cli/deploy/standalone/sources-vehicle-simulator/docker-compose.yml b/cli/deploy/standalone/sources-vehicle-simulator/docker-compose.yml
index b310968..840474d 100644
--- a/cli/deploy/standalone/sources-vehicle-simulator/docker-compose.yml
+++ b/cli/deploy/standalone/sources-vehicle-simulator/docker-compose.yml
@@ -16,7 +16,7 @@
 version: "3.4"
 services:
   sources-vehicle-simulator:
-    image: ${SP_DOCKER_REGISTRY}sources-vehicle-simulator:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}sources-vehicle-simulator:${SP_VERSION}
     depends_on:
       - "consul"
     logging:
diff --git a/cli/deploy/standalone/sources-watertank-simulator/docker-compose.yml b/cli/deploy/standalone/sources-watertank-simulator/docker-compose.yml
index 2fb0b75..70c273d 100644
--- a/cli/deploy/standalone/sources-watertank-simulator/docker-compose.yml
+++ b/cli/deploy/standalone/sources-watertank-simulator/docker-compose.yml
@@ -16,7 +16,7 @@
 version: "3.4"
 services:
   sources-watertank-simulator:
-    image: ${SP_DOCKER_REGISTRY}sources-watertank-simulator:${SP_PE_VERSION}
+    image: ${SP_DOCKER_REGISTRY}sources-watertank-simulator:${SP_VERSION}
     depends_on:
       - "consul"
 #    ports:
diff --git a/cli/deploy/standalone/ui/docker-compose.yml b/cli/deploy/standalone/ui/docker-compose.yml
index 12c4306..7a532bd 100644
--- a/cli/deploy/standalone/ui/docker-compose.yml
+++ b/cli/deploy/standalone/ui/docker-compose.yml
@@ -16,7 +16,7 @@
 version: "3.4"
 services:
   ui:
-    image: ${SP_DOCKER_REGISTRY}ui:${SP_BACKEND_VERSION}
+    image: ${SP_DOCKER_REGISTRY}ui:${SP_VERSION}
     ports:
       - "80:80"
     depends_on: