Bump influx version to 2.6 in compose files (#1157)

apache · Jan 29, 2023 · c50fae6 · c50fae6
1 parent 530bac0
commit c50fae6
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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: