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/02/23 23:01:19 UTC
[incubator-streampipes-installer] branch dev updated: switch to
apachestreampipes repository and some updates to the installer
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 b7f63ee switch to apachestreampipes repository and some updates to the installer
b7f63ee is described below
commit b7f63ee2e5d03c7db26d32476d274e0115300631
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Mon Feb 24 00:01:06 2020 +0100
switch to apachestreampipes repository and some updates to the installer
---
installer/templates/.env | 10 ++-----
installer/templates/docker-compose.full.yml | 43 ++++++++++++++---------------
installer/templates/docker-compose.lite.yml | 12 ++++----
3 files changed, 29 insertions(+), 36 deletions(-)
diff --git a/installer/templates/.env b/installer/templates/.env
index 02a37a2..31fa8d2 100644
--- a/installer/templates/.env
+++ b/installer/templates/.env
@@ -14,10 +14,6 @@
# limitations under the License.
SP_HOST=kafka
-SP_KAFKA_HOST=kafka
-SP_VERSION=0.65.0
-SP_UI_VERSION=0.65.0
-SP_REGISTRY_MAIN=streampipes
-SP_REGISTRY_PE=streampipes
-SP_REGISTRY_CONNECT=streampipes
-SP_REGISTRY_UI=streampipes
+SP_BACKEND_VERSION=0.65.1-SNAPSHOT
+SP_PE_VERSION=0.65.1-SNAPSHOT
+SP_DOCKER_REGISTRY=apachestreampipes
diff --git a/installer/templates/docker-compose.full.yml b/installer/templates/docker-compose.full.yml
index 2bc2269..2e98251 100644
--- a/installer/templates/docker-compose.full.yml
+++ b/installer/templates/docker-compose.full.yml
@@ -121,7 +121,7 @@ services:
#### StreamPipes services
backend:
- image: "${SP_REGISTRY_MAIN}/backend:${SP_VERSION}"
+ image: "${SP_DOCKER_REGISTRY}/backend:${SP_BACKEND_VERSION}"
depends_on:
- consul
- couchdb
@@ -134,7 +134,7 @@ services:
spnet:
connect-master:
- image: "${SP_REGISTRY_MAIN}/streampipes-connect-container:${SP_VERSION}"
+ image: "${SP_DOCKER_REGISTRY}/streampipes-connect-container:${SP_BACKEND_VERSION}"
depends_on:
- consul
- couchdb
@@ -150,7 +150,7 @@ services:
spnet:
connect-worker-main:
- image: "${SP_REGISTRY_CONNECT}/streampipes-connect-worker:${SP_VERSION}"
+ image: "${SP_DOCKER_REGISTRY}/connect-worker:${SP_BACKEND_VERSION}"
depends_on:
- consul
- couchdb
@@ -165,7 +165,7 @@ services:
spnet:
nginx:
- image: "${SP_REGISTRY_UI}/ui:${SP_UI_VERSION}"
+ image: "${SP_DOCKER_REGISTRY}/ui:${SP_BACKEND_VERSION}"
ports:
- "80:80"
depends_on:
@@ -181,66 +181,63 @@ services:
#### Lite version pipeline elements
processors-filters-jvm:
- image: "${SP_REGISTRY_PE}/processors-filters-jvm:${SP_VERSION}"
+ image: "${SP_DOCKER_REGISTRY}/processors-filters-jvm:${SP_PE_VERSION}"
depends_on:
- "consul"
networks:
spnet:
processors-filters-siddhi:
- image: "${SP_REGISTRY_PE}/processors-filters-siddhi:${SP_VERSION}"
+ image: "${SP_DOCKER_REGISTRY}/processors-filters-siddhi:${SP_PE_VERSION}"
depends_on:
- "consul"
networks:
spnet:
processors-image-processing-jvm:
- image: "${SP_REGISTRY_PE}/processors-image-processing-jvm:${SP_VERSION}"
+ image: "${SP_DOCKER_REGISTRY}/processors-image-processing-jvm:${SP_PE_VERSION}"
depends_on:
- "consul"
networks:
spnet:
processors-transformation-jvm:
- image: "${SP_REGISTRY_PE}/processors-transformation-jvm:${SP_VERSION}"
+ image: "${SP_DOCKER_REGISTRY}/processors-transformation-jvm:${SP_PE_VERSION}"
depends_on:
- "consul"
networks:
spnet:
sinks-brokers-jvm:
- image: "${SP_REGISTRY_PE}/sinks-brokers-jvm:${SP_VERSION}"
+ image: "${SP_DOCKER_REGISTRY}/sinks-brokers-jvm:${SP_PE_VERSION}"
depends_on:
- "consul"
networks:
spnet:
sinks-databases-jvm:
- image: "${SP_REGISTRY_PE}/sinks-databases-jvm:${SP_VERSION}"
+ image: "${SP_DOCKER_REGISTRY}/sinks-databases-jvm:${SP_PE_VERSION}"
depends_on:
- "consul"
networks:
spnet:
sinks-internal-jvm:
- image: "${SP_REGISTRY_PE}/sinks-internal-jvm:${SP_VERSION}"
+ image: "${SP_DOCKER_REGISTRY}/sinks-internal-jvm:${SP_PE_VERSION}"
depends_on:
- "consul"
- environment:
- - STREAMPIPES_HOST=${SP_HOST}
- - SP_NGINX_HOST=${SP_HOST}
networks:
spnet:
sinks-notifications-jvm:
- image: "${SP_REGISTRY_PE}/sinks-notifications-jvm:${SP_VERSION}"
+ image: "${SP_DOCKER_REGISTRY}/sinks-notifications-jvm:${SP_PE_VERSION}"
depends_on:
- "consul"
networks:
spnet:
sources-watertank-simulator:
- image: "${SP_REGISTRY_PE}/sources-watertank-simulator:${SP_VERSION}"
+ image: "${SP_DOCKER_REGISTRY}/sources-watertank-simulator:${SP_PE_VERSION}"
depends_on:
- "consul"
- "kafka"
@@ -250,49 +247,49 @@ services:
#### Full version pipeline elements
processors-aggregation-flink:
- image: "${SP_REGISTRY_PE}/processors-aggregation-flink:${SP_VERSION}"
+ image: "${SP_DOCKER_REGISTRY}/processors-aggregation-flink:${SP_PE_VERSION}"
depends_on:
- "consul"
networks:
spnet:
processors-enricher-flink:
- image: "${SP_REGISTRY_PE}/processors-enricher-flink:${SP_VERSION}"
+ image: "${SP_DOCKER_REGISTRY}/processors-enricher-flink:${SP_PE_VERSION}"
depends_on:
- "consul"
networks:
spnet:
processors-pattern-detection-flink:
- image: "${SP_REGISTRY_PE}/processors-pattern-detection-flink:${SP_VERSION}"
+ image: "${SP_DOCKER_REGISTRY}/processors-pattern-detection-flink:${SP_PE_VERSION}"
depends_on:
- "consul"
networks:
spnet:
processors-statistics-flink:
- image: "${SP_REGISTRY_PE}/processors-statistics-flink:${SP_VERSION}"
+ image: "${SP_DOCKER_REGISTRY}/processors-statistics-flink:${SP_PE_VERSION}"
depends_on:
- "consul"
networks:
spnet:
processors-transformation-flink:
- image: "${SP_REGISTRY_PE}/processors-transformation-flink:${SP_VERSION}"
+ image: "${SP_DOCKER_REGISTRY}/processors-transformation-flink:${SP_PE_VERSION}"
depends_on:
- "consul"
networks:
spnet:
sinks-databases-flink:
- image: "${SP_REGISTRY_PE}/sinks-databases-flink:${SP_VERSION}"
+ image: "${SP_DOCKER_REGISTRY}/sinks-databases-flink:${SP_PE_VERSION}"
depends_on:
- "consul"
networks:
spnet:
sources-vehicle-simulator:
- image: "${SP_REGISTRY_PE}/sources-vehicle-simulator:${SP_VERSION}"
+ image: "${SP_DOCKER_REGISTRY}/sources-vehicle-simulator:${SP_PE_VERSION}"
depends_on:
- "consul"
- "kafka"
diff --git a/installer/templates/docker-compose.lite.yml b/installer/templates/docker-compose.lite.yml
index 7335479..331ceca 100644
--- a/installer/templates/docker-compose.lite.yml
+++ b/installer/templates/docker-compose.lite.yml
@@ -138,7 +138,7 @@ services:
#### StreamPipes services
backend:
- image: "${SP_REGISTRY_MAIN}/backend:${SP_VERSION}"
+ image: "${SP_DOCKER_REGISTRY}/backend:${SP_BACKEND_VERSION}"
depends_on:
- consul
- couchdb
@@ -150,7 +150,7 @@ services:
spnet:
connect-master:
- image: "${SP_REGISTRY_MAIN}/streampipes-connect-container:${SP_VERSION}"
+ image: "${SP_DOCKER_REGISTRY}/streampipes-connect-container:${SP_BACKEND_VERSION}"
depends_on:
- consul
- couchdb
@@ -166,7 +166,7 @@ services:
spnet:
connect-worker-main:
- image: "${SP_REGISTRY_CONNECT}/streampipes-connect-worker:${SP_VERSION}"
+ image: "${SP_DOCKER_REGISTRY}/connect-worker:${SP_BACKEND_VERSION}"
depends_on:
- consul
- couchdb
@@ -181,7 +181,7 @@ services:
spnet:
nginx:
- image: "${SP_REGISTRY_UI}/ui:${SP_UI_VERSION}"
+ image: "${SP_DOCKER_REGISTRY}/ui:${SP_BACKEND_VERSION}"
ports:
- "80:80"
depends_on:
@@ -197,14 +197,14 @@ services:
#### Lite version pipeline elements
pipeline-elements-all-jvm:
- image: "${SP_REGISTRY_PE}/pipeline-elements-all-jvm:${SP_VERSION}"
+ image: "${SP_DOCKER_REGISTRY}/pipeline-elements-all-jvm:${SP_PE_VERSION}"
depends_on:
- "consul"
networks:
spnet:
sources-watertank-simulator:
- image: "${SP_REGISTRY_PE}/sources-watertank-simulator:${SP_VERSION}"
+ image: "${SP_DOCKER_REGISTRY}/sources-watertank-simulator:${SP_PE_VERSION}"
depends_on:
- "consul"
- "kafka"