You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2023/01/29 15:11:19 UTC

[streampipes] 03/05: Bump influx version to 2.6 in compose files (#1157)

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

riemer pushed a commit to branch sp-1157-upgrade-third-party-services
in repository https://gitbox.apache.org/repos/asf/streampipes.git

commit c50fae6d4768a170e3e649d7e4742a4a07b7347f
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Sun Jan 29 15:58:22 2023 +0100

    Bump influx version to 2.6 in compose files (#1157)
---
 docker-compose.yml                        | 10 +++++++++-
 installer/compose/docker-compose.full.yml | 10 +++++++++-
 installer/compose/docker-compose.nats.yml | 10 +++++++++-
 installer/compose/docker-compose.yml      | 10 +++++++++-
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 9d193b571..a3786fc6a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -141,13 +141,20 @@ services:
       spnet:
 
   influxdb:
-    image: fogsyio/influxdb:1.7
+    image: influxdb:2.6
     environment:
       - INFLUXDB_DATA_ENGINE=tsm1
       - INFLUXDB_REPORTING_DISABLED=false
       - INFLUXDB_ADMIN_ENABLED=true
+      - DOCKER_INFLUXDB_INIT_USERNAME=admin
+      - DOCKER_INFLUXDB_INIT_PASSWORD=sp-admin
+      - DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=sp-admin
+      - DOCKER_INFLUXDB_INIT_ORG=sp
+      - DOCKER_INFLUXDB_INIT_BUCKET=sp
+      - DOCKER_INFLUXDB_INIT_MODE=upgrade
     volumes:
       - influxdb:/var/lib/influxdb
+      - influxdb2:/var/lib/influxdb2
     logging: *default-logging
     networks:
       spnet:
@@ -159,6 +166,7 @@ volumes:
   couchdb:
   zookeeper:
   influxdb:
+  influxdb2:
   backend:
 
 networks:
diff --git a/installer/compose/docker-compose.full.yml b/installer/compose/docker-compose.full.yml
index 6c1274f50..a9eb6608e 100644
--- a/installer/compose/docker-compose.full.yml
+++ b/installer/compose/docker-compose.full.yml
@@ -151,13 +151,20 @@ services:
       spnet:
 
   influxdb:
-    image: fogsyio/influxdb:1.7
+    image: influxdb:2.6
     environment:
       - INFLUXDB_DATA_ENGINE=tsm1
       - INFLUXDB_REPORTING_DISABLED=false
       - INFLUXDB_ADMIN_ENABLED=true
+      - DOCKER_INFLUXDB_INIT_USERNAME=admin
+      - DOCKER_INFLUXDB_INIT_PASSWORD=sp-admin
+      - DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=sp-admin
+      - DOCKER_INFLUXDB_INIT_ORG=sp
+      - DOCKER_INFLUXDB_INIT_BUCKET=sp
+      - DOCKER_INFLUXDB_INIT_MODE=upgrade
     volumes:
       - influxdb:/var/lib/influxdb
+      - influxdb2:/var/lib/influxdb2
     logging: *default-logging
     restart: unless-stopped
     networks:
@@ -240,6 +247,7 @@ volumes:
   kafka:
   zookeeper:
   influxdb:
+  influxdb2:
   files:
   nginx:
   
diff --git a/installer/compose/docker-compose.nats.yml b/installer/compose/docker-compose.nats.yml
index 542703c1c..2d910c6ff 100644
--- a/installer/compose/docker-compose.nats.yml
+++ b/installer/compose/docker-compose.nats.yml
@@ -92,13 +92,20 @@ services:
       spnet:
 
   influxdb:
-    image: fogsyio/influxdb:1.7
+    image: influxdb:2.6
     environment:
       - INFLUXDB_DATA_ENGINE=tsm1
       - INFLUXDB_REPORTING_DISABLED=false
       - INFLUXDB_ADMIN_ENABLED=true
+      - DOCKER_INFLUXDB_INIT_USERNAME=admin
+      - DOCKER_INFLUXDB_INIT_PASSWORD=sp-admin
+      - DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=sp-admin
+      - DOCKER_INFLUXDB_INIT_ORG=sp
+      - DOCKER_INFLUXDB_INIT_BUCKET=sp
+      - DOCKER_INFLUXDB_INIT_MODE=upgrade
     volumes:
       - influxdb:/var/lib/influxdb
+      - influxdb2:/var/lib/influxdb2
     logging: *default-logging
     restart: unless-stopped
     networks:
@@ -126,6 +133,7 @@ volumes:
   connect:
   couchdb:
   influxdb:
+  influxdb2:
   nginx:
 
 
diff --git a/installer/compose/docker-compose.yml b/installer/compose/docker-compose.yml
index 8561b236a..2c7b0150e 100644
--- a/installer/compose/docker-compose.yml
+++ b/installer/compose/docker-compose.yml
@@ -123,13 +123,20 @@ services:
       spnet:
 
   influxdb:
-    image: fogsyio/influxdb:1.7
+    image: influxdb:2.6
     environment:
       - INFLUXDB_DATA_ENGINE=tsm1
       - INFLUXDB_REPORTING_DISABLED=false
       - INFLUXDB_ADMIN_ENABLED=true
+      - DOCKER_INFLUXDB_INIT_USERNAME=admin
+      - DOCKER_INFLUXDB_INIT_PASSWORD=sp-admin
+      - DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=sp-admin
+      - DOCKER_INFLUXDB_INIT_ORG=sp
+      - DOCKER_INFLUXDB_INIT_BUCKET=sp
+      - DOCKER_INFLUXDB_INIT_MODE=upgrade
     volumes:
       - influxdb:/var/lib/influxdb
+      - influxdb2:/var/lib/influxdb2
     logging: *default-logging
     restart: unless-stopped
     networks:
@@ -166,6 +173,7 @@ volumes:
   kafka:
   zookeeper:
   influxdb:
+  influxdb2:
   files:
   nginx: