This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch
3450-remove-subnet-from-docker-compose-configuration
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to
refs/heads/3450-remove-subnet-from-docker-compose-configuration by this push:
new b8a3d977ee refactor(#3450): Remove the subnet configuration from the
docker setup
b8a3d977ee is described below
commit b8a3d977ee948525e724f3bb75f4e36fd8cf2bde
Author: Philipp Zehnder <[email protected]>
AuthorDate: Fri Jan 31 09:54:48 2025 +0100
refactor(#3450): Remove the subnet configuration from the docker setup
---
installer/cli/.env | 1 -
installer/cli/bin/commands/up | 3 +--
installer/compose/.env | 1 -
installer/compose/docker-compose.full.yml | 4 ----
installer/compose/docker-compose.minimal.yml | 4 ----
installer/compose/docker-compose.nats.yml | 3 ---
installer/compose/docker-compose.pulsar.yml | 3 ---
installer/compose/docker-compose.quickstart.yml | 3 ---
installer/compose/docker-compose.yml | 3 ---
ui/cypress/tests/experimental/testJvmArchetype/.env | 1 -
ui/cypress/tests/experimental/testJvmArchetype/backend/.env | 1 -
.../tests/experimental/testJvmArchetype/backend/docker-compose.yml | 3 ---
ui/cypress/tests/experimental/testJvmArchetype/docker-compose.yml | 3 ---
13 files changed, 1 insertion(+), 32 deletions(-)
diff --git a/installer/cli/.env b/installer/cli/.env
index 8536887d28..149e8230cd 100644
--- 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
index 2e2ee5d77b..de9b6a86ad 100755
--- 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
index e8d067b38b..9cf2ad1f71 100644
--- 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
index 3ad4679ae4..2ad26d92cd 100644
--- 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
index 97267e3975..cc4944778c 100644
--- 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
index 3e7bb6a436..4c3fdefc9d 100644
--- 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
index 52c8d10137..1366e93990 100644
--- 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
index 1dde57faba..175d931f0d 100644
--- 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}
\ No newline at end of file
diff --git a/installer/compose/docker-compose.yml
b/installer/compose/docker-compose.yml
index 7dd664af09..6157972476 100644
--- 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
index 0ad93efe88..64d59da58b 100644
--- 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
index 0ad93efe88..64d59da58b 100644
--- 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
index debed8f18b..21d03be14d 100644
--- 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
index 41ea68cc57..5853f3c5d1 100644
--- 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}
