This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new b88f11ba69 refactor(#3499): Remove unused volume for files (#3500)
b88f11ba69 is described below
commit b88f11ba697fbb6aab03559893a50cec33c7392c
Author: Philipp Zehnder <[email protected]>
AuthorDate: Mon Feb 24 13:23:15 2025 +0100
refactor(#3499): Remove unused volume for files (#3500)
---
docker-compose.yml | 4 -
.../deploy/standalone/backend/docker-compose.yml | 2 -
.../extensions-all-jvm/docker-compose.yml | 5 -
.../pipeline-elements-all-jvm/docker-compose.yml | 5 -
.../sinks-internal-jvm/docker-compose.yml | 5 -
installer/compose/docker-compose.full.yml | 4 -
installer/compose/docker-compose.quickstart.yml | 143 ---------------------
installer/compose/docker-compose.yml | 4 -
installer/compose/quickstart/Dockerfile | 24 ----
installer/compose/quickstart/upload.sh | 101 ---------------
...set - Smart Factory Monitoring and Analysis.zip | Bin 78596 -> 0 bytes
streampipes-client-e2e/docker-compose.yml | 4 -
streampipes-extensions/docker-compose.yml | 79 ------------
.../testJvmArchetype/backend/docker-compose.yml | 2 -
.../testJvmArchetype/docker-compose.yml | 3 -
15 files changed, 385 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index e15d439227..ceed4e4b81 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -38,7 +38,6 @@ services:
- couchdb
volumes:
- backend:/root/.streampipes
- - files:/spImages
logging: *default-logging
networks:
spnet:
@@ -66,8 +65,6 @@ services:
context: ./streampipes-extensions/streampipes-extensions-all-jvm
dockerfile: Dockerfile
image: streampipes_pipeline-elements-all-jvm:release-validation
- volumes:
- - files:/spImages
logging: *default-logging
networks:
spnet:
@@ -138,7 +135,6 @@ services:
volumes:
kafka3:
- files:
couchdb:
influxdb:
influxdb2:
diff --git a/installer/cli/deploy/standalone/backend/docker-compose.yml
b/installer/cli/deploy/standalone/backend/docker-compose.yml
index b4a86aa676..ebaaba2e1c 100644
--- a/installer/cli/deploy/standalone/backend/docker-compose.yml
+++ b/installer/cli/deploy/standalone/backend/docker-compose.yml
@@ -20,7 +20,6 @@ services:
- couchdb
volumes:
- backend:/root/.streampipes
- - files:/spImages
environment:
- SP_PRIORITIZED_PROTOCOL=${SP_PRIORITIZED_PROTOCOL:-kafka}
- SP_MQTT_HOST=${SP_MQTT_HOST:-activemq}
@@ -35,7 +34,6 @@ services:
volumes:
backend:
- files:
networks:
spnet:
diff --git
a/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.yml
b/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.yml
index d86f36c528..571b1c50c7 100644
--- a/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.yml
+++ b/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.yml
@@ -21,8 +21,6 @@ services:
- SP_SETUP_PROMETHEUS_ENDPOINT=${SP_SETUP_PROMETHEUS_ENDPOINT}
depends_on:
- couchdb
- volumes:
- - files:/spImages
logging:
driver: "json-file"
options:
@@ -31,9 +29,6 @@ services:
networks:
spnet:
-volumes:
- files:
-
networks:
spnet:
external: true
diff --git
a/installer/cli/deploy/standalone/pipeline-elements-all-jvm/docker-compose.yml
b/installer/cli/deploy/standalone/pipeline-elements-all-jvm/docker-compose.yml
index 0ce11451a3..7464d80ced 100644
---
a/installer/cli/deploy/standalone/pipeline-elements-all-jvm/docker-compose.yml
+++
b/installer/cli/deploy/standalone/pipeline-elements-all-jvm/docker-compose.yml
@@ -16,8 +16,6 @@
services:
pipeline-elements-all-jvm:
image: ${SP_DOCKER_REGISTRY}/pipeline-elements-all-jvm:${SP_VERSION}
- volumes:
- - files:/spImages
logging:
driver: "json-file"
options:
@@ -26,9 +24,6 @@ services:
networks:
spnet:
-volumes:
- files:
-
networks:
spnet:
external: true
diff --git
a/installer/cli/deploy/standalone/sinks-internal-jvm/docker-compose.yml
b/installer/cli/deploy/standalone/sinks-internal-jvm/docker-compose.yml
index 15060749e8..f0e6bb8f15 100644
--- a/installer/cli/deploy/standalone/sinks-internal-jvm/docker-compose.yml
+++ b/installer/cli/deploy/standalone/sinks-internal-jvm/docker-compose.yml
@@ -16,8 +16,6 @@
services:
sinks-internal-jvm:
image: ${SP_DOCKER_REGISTRY}/sinks-internal-jvm:${SP_VERSION}
- volumes:
- - files:/spImages
logging:
driver: "json-file"
options:
@@ -26,9 +24,6 @@ services:
networks:
spnet:
-volumes:
- files:
-
networks:
spnet:
external: true
diff --git a/installer/compose/docker-compose.full.yml
b/installer/compose/docker-compose.full.yml
index 47d12fff2e..65a2e1b652 100644
--- a/installer/compose/docker-compose.full.yml
+++ b/installer/compose/docker-compose.full.yml
@@ -30,7 +30,6 @@ services:
- couchdb
volumes:
- backend:/root/.streampipes
- - files:/spImages
logging: *default-logging
restart: unless-stopped
networks:
@@ -134,8 +133,6 @@ services:
# Lite version pipeline elements
extensions-all-jvm:
image: "${SP_DOCKER_REGISTRY}/extensions-all-jvm:${SP_VERSION}"
- volumes:
- - files:/spImages
logging: *default-logging
restart: unless-stopped
networks:
@@ -148,7 +145,6 @@ volumes:
kafka3:
influxdb:
influxdb2:
- files:
nginx:
networks:
diff --git a/installer/compose/docker-compose.quickstart.yml
b/installer/compose/docker-compose.quickstart.yml
deleted file mode 100644
index 915c7901eb..0000000000
--- a/installer/compose/docker-compose.quickstart.yml
+++ /dev/null
@@ -1,143 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# global logging
-x-logging:
- &default-logging
- options:
- max-size: '12m'
- max-file: '5'
- driver: json-file
-
-services:
-
- # StreamPipes services
- backend:
- image: "${SP_DOCKER_REGISTRY}/backend:${SP_VERSION}"
- depends_on:
- - couchdb
- volumes:
- - backend:/root/.streampipes
- - files:/spImages
- logging: *default-logging
- restart: unless-stopped
- networks:
- spnet:
-
- ui:
- image: "${SP_DOCKER_REGISTRY}/ui:${SP_VERSION}"
- environment:
- - SP_HTTP_SERVER_ADAPTER_ENDPOINT=extensions-all-jvm:8090
- ports:
- - "80:8088"
- depends_on:
- - couchdb
- - backend
- volumes:
- - nginx:/etc/nginx/
- logging: *default-logging
- restart: unless-stopped
- networks:
- spnet:
-
- couchdb:
- image: couchdb:3.3.1
- environment:
- - COUCHDB_USER=admin
- - COUCHDB_PASSWORD=admin
- volumes:
- - couchdb:/opt/couchdb/data
- logging: *default-logging
- restart: unless-stopped
- networks:
- spnet:
-
- kafka:
- image: bitnami/kafka:3.9.0
- hostname: kafka
- environment:
- - KAFKA_CFG_NODE_ID=0
- - KAFKA_CFG_PROCESS_ROLES=controller,broker
- - KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093
- -
KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093,OUTSIDE://:9094
- -
KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092,OUTSIDE://localhost:9094
- -
KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,OUTSIDE:PLAINTEXT
- - KAFKA_CFG_INTER_BROKER_LISTENER_NAME=PLAINTEXT
- - KAFKA_CFG_MESSAGE_MAX_BYTES=5000012
- - KAFKA_CFG_FETCH_MESSAGE_MAX_BYTES=5000012
- - KAFKA_CFG_REPLICA_FETCH_MAX_BYTES=10000000
- - KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER
- volumes:
- - kafka3:/bitnami
- logging: *default-logging
- restart: unless-stopped
- networks:
- spnet:
-
- influxdb:
- 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=${SP_INFLUX_INIT_MODE}
- volumes:
- - influxdb:/var/lib/influxdb
- - influxdb2:/var/lib/influxdb2
- logging: *default-logging
- restart: unless-stopped
- networks:
- spnet:
-
- # Lite version pipeline elements
- extensions-all-jvm:
- image: "${SP_DOCKER_REGISTRY}/extensions-all-jvm:${SP_VERSION}"
- volumes:
- - files:/spImages
- logging: *default-logging
- restart: unless-stopped
- networks:
- spnet:
-
- script-runner:
- build: ./quickstart
- depends_on:
- - backend
- volumes:
- - ./quickstart/zip_folder:/zip_folder
- networks:
- spnet:
-
-
-
-volumes:
- backend:
- connect:
- couchdb:
- kafka3:
- influxdb:
- influxdb2:
- files:
- nginx:
-
-
-networks:
- spnet:
- driver: bridge
diff --git a/installer/compose/docker-compose.yml
b/installer/compose/docker-compose.yml
index 5c8a9e3c77..338d138fcc 100644
--- a/installer/compose/docker-compose.yml
+++ b/installer/compose/docker-compose.yml
@@ -32,7 +32,6 @@ services:
- couchdb
volumes:
- backend:/root/.streampipes
- - files:/spImages
logging: *default-logging
restart: unless-stopped
networks:
@@ -109,8 +108,6 @@ services:
# Lite version pipeline elements
extensions-all-jvm:
image: "${SP_DOCKER_REGISTRY}/extensions-all-jvm:${SP_VERSION}"
- volumes:
- - files:/spImages
logging: *default-logging
restart: unless-stopped
networks:
@@ -124,7 +121,6 @@ volumes:
kafka3:
influxdb:
influxdb2:
- files:
nginx:
diff --git a/installer/compose/quickstart/Dockerfile
b/installer/compose/quickstart/Dockerfile
deleted file mode 100644
index b1be08b658..0000000000
--- a/installer/compose/quickstart/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Use an official base image
-FROM ubuntu:latest
-
-RUN apt-get update \
- && apt-get install -y curl jq
-
-COPY upload.sh /usr/local/bin/upload.sh
-RUN chmod +x /usr/local/bin/upload.sh
-
-CMD ["/usr/local/bin/upload.sh"]
diff --git a/installer/compose/quickstart/upload.sh
b/installer/compose/quickstart/upload.sh
deleted file mode 100755
index 6c0a2b8d4b..0000000000
--- a/installer/compose/quickstart/upload.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#!/bin/bash
-if [ -z "$SP_INITIAL_ADMIN_EMAIL" ]; then
- USERNAME="[email protected]"
-else
- USERNAME="$SP_INITIAL_ADMIN_EMAIL"
-fi
-
-if [ -z "$SP_INITIAL_ADMIN_PASSWORD" ]; then
- PASSWORD="admin"
-else
- PASSWORD="$SP_INITIAL_ADMIN_PASSWORD"
-fi
-
-while true; do
- if curl -s "http://backend:8030/streampipes-backend/api/v2/auth/login";
--max-time 10 &> /dev/null; then
- echo "StreamPipes backend is now ready!"
- break
- else
- echo "StreamPipes backend not ready, waiting for 3 seconds..."
- sleep 3
- fi
-done
-
-JSON_TOKEN_RESPONSE=$(curl -s -X POST
"http://backend:8030/streampipes-backend/api/v2/auth/login"; \
- -H "Content-Type: application/json" \
- -d "{\"username\":\"$USERNAME\",\"password\":\"$PASSWORD\"}")
-
-TOKEN=$(echo "$JSON_TOKEN_RESPONSE" | jq -r '.accessToken')
-RESPONSE_TOKEN="Bearer $TOKEN"
-
-JSON_RESOURCE_ITEMS=$(curl -s -X GET
"http://backend:8030/streampipes-backend/api/v2/rdfendpoints/items"; \
- -H "Content-Type: application/json" \
- -H "Authorization: $RESPONSE_TOKEN")
-
-ARRAY_LENGTH=$(echo $JSON_RESOURCE_ITEMS | jq '. | length')
-
-while [ $ARRAY_LENGTH -le 100 ]; do
- echo "StreamPipes Extensions Service not ready, waiting for 3 seconds..."
- sleep 3
- JSON_RESOURCE_ITEMS=$(curl -s -X GET
"http://backend:8030/streampipes-backend/api/v2/rdfendpoints/items"; \
- -H "Content-Type: application/json" \
- -H "Authorization: $RESPONSE_TOKEN")
- ARRAY_LENGTH=$(echo $JSON_RESOURCE_ITEMS | jq '. | length')
-done
-
-ITEM_MAP_NAME_URI=$(echo $JSON_RESOURCE_ITEMS | jq -r 'map({(.name): .uri}) |
add')
-
-ITEM_MAP_NAME_URI=$(echo $JSON_RESOURCE_ITEMS | jq -r 'map({(.name): .uri}) |
add')
-
-for ZIP_FILE in /zip_folder/*.zip; do
- JSON_RESPONSE=$(curl --compressed -X POST
"http://backend:8030/streampipes-backend/api/v2/import/preview"; \
- -H "Authorization: $RESPONSE_TOKEN" \
- -F "file_upload=@$ZIP_FILE")
-
- PIPELINE_IDS=($(echo "$JSON_RESPONSE" | jq -r '.pipelines[].resourceId'))
-
- for id in "${PIPELINE_IDS[@]}"; do
-
- ITEMS_PIPELINES=$(curl -s -X GET
"http://backend:8030/streampipes-backend/api/v2/pipelines/$id"; \
- -H "Content-Type: application/json" \
- -H "Authorization: $RESPONSE_TOKEN")
-
- KEYS=$(echo $ITEMS_PIPELINES | jq -r 'keys[]')
-
- for key in $KEYS; do
- if [ "$(echo $ITEMS_PIPELINES | jq ".${key} | type")" == '"array"' ];
then
- key=$(echo $ITEMS_PIPELINES | jq -r ".${key}[]? | .name")
- value=$(echo $ITEM_MAP_NAME_URI | jq -r ".\"$key\"")
-
- curl -s -X POST
"http://backend:8030/streampipes-backend/api/v2/element"; \
- -H "Content-Type: application/x-www-form-urlencoded;charset=UTF-8"
\
- -H "Authorization: $RESPONSE_TOKEN" \
- --data-urlencode "uri=$value" \
- --data-urlencode "publicElement=true"
- fi
- done
- done
-
- JSON_PAYLOAD="$JSON_RESPONSE"
-
- curl -i -X POST "http://backend:8030/streampipes-backend/api/v2/import"; \
- -H "Authorization: $RESPONSE_TOKEN" \
- -F "file_upload=@$ZIP_FILE" \
- -F "configuration=@-;type=application/json" <<< "$JSON_PAYLOAD"
-done
diff --git a/installer/compose/quickstart/zip_folder/Example Asset - Smart
Factory Monitoring and Analysis.zip
b/installer/compose/quickstart/zip_folder/Example Asset - Smart Factory
Monitoring and Analysis.zip
deleted file mode 100644
index 4c0895a614..0000000000
Binary files a/installer/compose/quickstart/zip_folder/Example Asset - Smart
Factory Monitoring and Analysis.zip and /dev/null differ
diff --git a/streampipes-client-e2e/docker-compose.yml
b/streampipes-client-e2e/docker-compose.yml
index 302f05a8af..05e33861bb 100644
--- a/streampipes-client-e2e/docker-compose.yml
+++ b/streampipes-client-e2e/docker-compose.yml
@@ -31,15 +31,12 @@ services:
- couchdb
volumes:
- backend:/root/.streampipes
- - files:/spImages
logging: *default-logging
networks:
spnet:
extensions-all-jvm:
image: streampipes_pipeline-elements-all-jvm:release-validation
- volumes:
- - files:/spImages
logging: *default-logging
networks:
spnet:
@@ -117,7 +114,6 @@ services:
volumes:
kafka:
- files:
couchdb:
zookeeper:
influxdb:
diff --git a/streampipes-extensions/docker-compose.yml
b/streampipes-extensions/docker-compose.yml
deleted file mode 100644
index bed234bd97..0000000000
--- a/streampipes-extensions/docker-compose.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# ============================================================
-# NOTICE
-# ============================================================
-# This docker-compose file is for validating releases only. To use
StreamPipes, use the installation instructions
-# provided on https://streampipes.apache.org/download
-#
-
-
-
-# global logging
-x-logging:
- &default-logging
- options:
- max-size: '12m'
- max-file: '5'
- driver: json-file
-
-services:
-
- #### apache/streampipes-extensions
- connect-worker-main:
- build:
- context: ./streampipes-connect-adapters
- dockerfile: Dockerfile
- args:
- BASE_IMAGE: adoptopenjdk/openjdk8-openj9:alpine
- image: streampipes_connect-worker-main:release-validation
- environment:
- - SP_CONNECT_CONTAINER_HOST=connect-master
- - SP_CONNECT_CONTAINER_WORKER=connect-worker-main
- logging: *default-logging
- networks:
- spnet:
-
- extensions-all-jvm:
- build:
- context: ./streampipes-extensions-all-jvm
- dockerfile: Dockerfile
- args:
- BASE_IMAGE: adoptopenjdk/openjdk8-openj9:alpine
- image: streampipes_extensions-all-jvm:release-validation
- volumes:
- - files:/spImages
- logging: *default-logging
- networks:
- spnet:
-
- pipeline-elements-experimental-flink:
- build:
- context: ./streampipes-pipeline-elements-experimental-flink
- dockerfile: Dockerfile
- args:
- BASE_IMAGE: adoptopenjdk/openjdk8-openj9:alpine
- image: streampipes_pipeline-elements-experimental-flink:release-validation
- logging: *default-logging
- networks:
- spnet:
-
-volumes:
- files:
-
-networks:
- spnet:
- external: true
\ No newline at end of file
diff --git
a/ui/cypress/tests/experimental/testJvmArchetype/backend/docker-compose.yml
b/ui/cypress/tests/experimental/testJvmArchetype/backend/docker-compose.yml
index 21d03be14d..7c30d21531 100644
--- a/ui/cypress/tests/experimental/testJvmArchetype/backend/docker-compose.yml
+++ b/ui/cypress/tests/experimental/testJvmArchetype/backend/docker-compose.yml
@@ -27,7 +27,6 @@ services:
image: '${SP_DOCKER_REGISTRY}/backend:${SP_VERSION}'
volumes:
- backend:/root/.streampipes
- - files:/spImages
logging: *default-logging
restart: unless-stopped
networks:
@@ -35,7 +34,6 @@ services:
volumes:
backend:
- files:
networks:
spnet:
diff --git a/ui/cypress/tests/experimental/testJvmArchetype/docker-compose.yml
b/ui/cypress/tests/experimental/testJvmArchetype/docker-compose.yml
index 5853f3c5d1..fe7d7829a9 100644
--- a/ui/cypress/tests/experimental/testJvmArchetype/docker-compose.yml
+++ b/ui/cypress/tests/experimental/testJvmArchetype/docker-compose.yml
@@ -99,8 +99,6 @@ services:
# Lite version pipeline elements
extensions-all-jvm:
image: '${SP_DOCKER_REGISTRY}/extensions-all-jvm:${SP_VERSION}'
- volumes:
- - files:/spImages
logging: *default-logging
restart: unless-stopped
networks:
@@ -121,7 +119,6 @@ volumes:
kafka:
zookeeper:
influxdb:
- files:
networks:
spnet:
