refactor(#3450): Remove the subnet configuration from the docker setup (

#3451)
apache · Jan 31, 2025 · 31a957b · 31a957b
1 parent bc4e605
commit 31a957b
Show file tree

Hide file tree

Showing 13 changed files with 1 addition and 32 deletions.
diff --git a/installer/cli/.env b/installer/cli/.env
@@ -15,7 +15,6 @@
 
 SP_DOCKER_REGISTRY=apachestreampipes
 SP_VERSION=0.98.0-SNAPSHOT
-SP_SUBNET=172.31.0.0/16
 COMPOSE_PROJECT_NAME=streampipes
 
 # -------------------------------------------------------------

diff --git a/installer/cli/bin/commands/up b/installer/cli/bin/commands/up
@@ -70,8 +70,7 @@ configure(){
 create_external_docker_network() {
 	if [ ! "$(docker network ls | grep spnet)" ]; then
 	  info "Creating docker network 'spnet'"
-    subnet=$(sed -n 's/^SP_SUBNET=//p' $STREAMPIPES_WORKDIR/.env)
-	  run "docker network create --driver=bridge --subnet=$subnet spnet" > /dev/null 2>&1
+	  run "docker network create --driver=bridge spnet" > /dev/null 2>&1
 	else
 	  info "Docker network 'spnet' already exists. Continuing"
 	fi

diff --git a/installer/compose/.env b/installer/compose/.env
@@ -15,7 +15,6 @@
 
 SP_VERSION=0.98.0-SNAPSHOT
 SP_DOCKER_REGISTRY=apachestreampipes
-SP_SUBNET=172.31.0.0/16
 COMPOSE_PROJECT_NAME=streampipes
 
 # For database migration in v0.91.0 - set init mode to 'upgrade' to migrate an existing installation

diff --git a/installer/compose/docker-compose.full.yml b/installer/compose/docker-compose.full.yml
@@ -167,7 +167,3 @@ volumes:
 networks:
   spnet:
     driver: bridge
-    ipam:
-     config:
-       - subnet: ${SP_SUBNET}
-
diff --git a/installer/compose/docker-compose.minimal.yml b/installer/compose/docker-compose.minimal.yml
@@ -93,7 +93,6 @@ services:
 
   extensions-iiot-minimal:
     image: "${SP_DOCKER_REGISTRY}/extensions-iiot-minimal:${SP_VERSION}"
-    depends_on:
     logging: *default-logging
     restart: unless-stopped
     networks:
@@ -110,7 +109,4 @@ volumes:
 networks:
   spnet:
     driver: bridge
-    ipam:
-      config:
-        - subnet: ${SP_SUBNET}
 
diff --git a/installer/compose/docker-compose.nats.yml b/installer/compose/docker-compose.nats.yml
@@ -111,7 +111,4 @@ volumes:
 networks:
   spnet:
     driver: bridge
-    ipam:
-      config:
-        - subnet: ${SP_SUBNET}
 
diff --git a/installer/compose/docker-compose.pulsar.yml b/installer/compose/docker-compose.pulsar.yml
@@ -106,7 +106,4 @@ volumes:
 networks:
   spnet:
     driver: bridge
-    ipam:
-      config:
-        - subnet: ${SP_SUBNET}
 
diff --git a/installer/compose/docker-compose.quickstart.yml b/installer/compose/docker-compose.quickstart.yml
@@ -152,6 +152,3 @@ volumes:
 networks:
   spnet:
     driver: bridge
-    ipam:
-      config:
-        - subnet: ${SP_SUBNET}
diff --git a/installer/compose/docker-compose.yml b/installer/compose/docker-compose.yml
@@ -142,7 +142,4 @@ volumes:
 networks:
   spnet:
     driver: bridge
-    ipam:
-     config:
-       - subnet: ${SP_SUBNET}
 
diff --git a/ui/cypress/tests/experimental/testJvmArchetype/.env b/ui/cypress/tests/experimental/testJvmArchetype/.env
@@ -15,5 +15,4 @@
 
 SP_VERSION=0.70.0
 SP_DOCKER_REGISTRY=apachestreampipes
-SP_SUBNET=172.31.0.0/16
 COMPOSE_PROJECT_NAME=streampipes
diff --git a/ui/cypress/tests/experimental/testJvmArchetype/backend/.env b/ui/cypress/tests/experimental/testJvmArchetype/backend/.env
@@ -15,5 +15,4 @@
 
 SP_VERSION=0.70.0
 SP_DOCKER_REGISTRY=apachestreampipes
-SP_SUBNET=172.31.0.0/16
 COMPOSE_PROJECT_NAME=streampipes
diff --git a/ui/cypress/tests/experimental/testJvmArchetype/backend/docker-compose.yml b/ui/cypress/tests/experimental/testJvmArchetype/backend/docker-compose.yml
@@ -40,6 +40,3 @@ volumes:
 networks:
     spnet:
         driver: bridge
-        ipam:
-            config:
-                - subnet: ${SP_SUBNET}
diff --git a/ui/cypress/tests/experimental/testJvmArchetype/docker-compose.yml b/ui/cypress/tests/experimental/testJvmArchetype/docker-compose.yml
@@ -126,6 +126,3 @@ volumes:
 networks:
     spnet:
         driver: bridge
-        ipam:
-            config:
-                - subnet: ${SP_SUBNET}