This is an automated email from the ASF dual-hosted git repository. wiener pushed a commit to branch edge-extensions in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git
commit 31af9cfa959e241a140fea04269cff0f1966a7ae Author: Patrick Wiener <[email protected]> AuthorDate: Fri May 21 14:16:21 2021 +0200 some minor refactoring to docker build script --- .../runConfigurations/node_controller_edge_01.xml | 1 + .../runConfigurations/node_controller_edge_02.xml | 2 +- build-docker.sh => docker-build.sh | 29 +++++++++++++++++++--- .../jvm/processor/dummy/DummyController.java | 2 +- .../numericalfilter/NumericalFilterController.java | 8 +++--- 5 files changed, 32 insertions(+), 10 deletions(-) diff --git a/.idea/runConfigurations/node_controller_edge_01.xml b/.idea/runConfigurations/node_controller_edge_01.xml index fd1cafc..9a4ccc8 100644 --- a/.idea/runConfigurations/node_controller_edge_01.xml +++ b/.idea/runConfigurations/node_controller_edge_01.xml @@ -9,6 +9,7 @@ <env name="SP_NODE_ACCESSIBLE_FIELD_DEVICE_ZED" value="zed;camera;usb;/dev/video1" /> <env name="SP_URL" value="http://localhost:8030"; /> <env name="SP_NODE_CONTROLLER_URL" value="http://edge01.example.de:7077"; /> + <env name="SP_VERSION" value="0.68.0-SNAPSHOT" /> </envs> <option name="MAIN_CLASS_NAME" value="org.apache.streampipes.node.controller.NodeControllerInit" /> <module name="streampipes-node-controller" /> diff --git a/.idea/runConfigurations/node_controller_edge_02.xml b/.idea/runConfigurations/node_controller_edge_02.xml index 480c1eb..3d12da0 100644 --- a/.idea/runConfigurations/node_controller_edge_02.xml +++ b/.idea/runConfigurations/node_controller_edge_02.xml @@ -6,8 +6,8 @@ <env name="SP_NODE_ACCESSIBLE_FIELD_DEVICE_ZED" value="zed;camera;usb;/dev/video0" /> <env name="SP_NODE_TAGS" value="fzi;main" /> <env name="SP_DEBUG" value="true" /> - <env name="SP_URL" value="http://host.docker.internal:8030"; /> <env name="SP_NODE_CONTROLLER_URL" value="http://edge02.example.de:7078"; /> + <env name="SP_URL" value="http://localhost:8030"; /> </envs> <option name="MAIN_CLASS_NAME" value="org.apache.streampipes.node.controller.NodeControllerInit" /> <module name="streampipes-node-controller" /> diff --git a/build-docker.sh b/docker-build.sh similarity index 59% rename from build-docker.sh rename to docker-build.sh index 9f1e7d3..88eded0 100755 --- a/build-docker.sh +++ b/docker-build.sh @@ -19,12 +19,35 @@ repo=apachestreampipes version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) -docker_build(){ +docker_build_amd(){ + echo "Docker build for amd ..." docker build --no-cache --pull \ -t $repo/$1:$version \ -f $2/Dockerfile $2 } +docker_build_arm(){ + echo "Docker build for arm ..." + docker buildx build \ + --platform linux/arm/v7 \ + -t $repo/$1:$version-aarch64 \ + -f $2/aarch64.Dockerfile $2 --load +} + +docker_build_aarch64(){ + echo "Docker build for aarch64 ..." + docker buildx build \ + --platform linux/arm64 \ + -t $repo/$1:$version-aarch64 \ + -f $2/aarch64.Dockerfile $2 --load +} + +docker_build_multiarch(){ + docker_build_amd $1 $2 + docker_build_arm $1 $2 + docker_build_aarch64 $1 $2 +} + echo "Start Docker builds ..." -docker_build extensions-all-jvm streampipes-extensions-all-jvm -docker_build pipeline-elements-all-jvm streampipes-pipeline-elements-all-jvm \ No newline at end of file +docker_build_multiarch extensions-all-jvm streampipes-extensions-all-jvm +docker_build_multiarch pipeline-elements-all-jvm streampipes-pipeline-elements-all-jvm \ No newline at end of file diff --git a/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/dummy/DummyController.java b/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/dummy/DummyController.java index b46c987..9eded2d 100644 --- a/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/dummy/DummyController.java +++ b/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/dummy/DummyController.java @@ -47,7 +47,7 @@ public class DummyController extends StreamPipesReconfigurableProcessor { .requiredStream(StreamRequirementsBuilder.any()) //.requiredNodeResources(ResourceRequirementsBuilder.any()) .requiredNodeResources(ResourceRequirementsBuilder.create() - .requiredGpu(true) + .requiredGpu(false) .requiredCores(1) .requiredMemory("128MB") .requiredStorage("50MB") diff --git a/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/numericalfilter/NumericalFilterController.java b/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/numericalfilter/NumericalFilterController.java index 3e5cf3a..054a81a 100644 --- a/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/numericalfilter/NumericalFilterController.java +++ b/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/numericalfilter/NumericalFilterController.java @@ -21,15 +21,12 @@ package org.apache.streampipes.processors.filters.jvm.processor.numericalfilter; import org.apache.streampipes.model.DataProcessorType; import org.apache.streampipes.model.graph.DataProcessorDescription; import org.apache.streampipes.model.graph.DataProcessorInvocation; +import org.apache.streampipes.model.grounding.KafkaTransportProtocol; import org.apache.streampipes.model.schema.PropertyScope; import org.apache.streampipes.sdk.builder.ProcessingElementBuilder; import org.apache.streampipes.sdk.builder.StreamRequirementsBuilder; import org.apache.streampipes.sdk.extractor.ProcessingElementParameterExtractor; -import org.apache.streampipes.sdk.helpers.EpRequirements; -import org.apache.streampipes.sdk.helpers.Labels; -import org.apache.streampipes.sdk.helpers.Locales; -import org.apache.streampipes.sdk.helpers.Options; -import org.apache.streampipes.sdk.helpers.OutputStrategies; +import org.apache.streampipes.sdk.helpers.*; import org.apache.streampipes.sdk.utils.Assets; import org.apache.streampipes.wrapper.standalone.ConfiguredEventProcessor; import org.apache.streampipes.wrapper.standalone.declarer.StandaloneEventProcessingDeclarer; @@ -51,6 +48,7 @@ public class NumericalFilterController extends StandaloneEventProcessingDeclarer .requiredPropertyWithUnaryMapping(EpRequirements.numberReq(), Labels.withId(NUMBER_MAPPING), PropertyScope.NONE).build()) + .supportedFormats(SupportedFormats.jsonFormat()) .outputStrategy(OutputStrategies.keep()) .requiredSingleValueSelection(Labels.withId(OPERATION), Options.from("<", "<=", ">", ">=", "==", "!="))
