You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by wi...@apache.org on 2021/06/11 10:08:12 UTC
[incubator-streampipes-extensions] branch edge-extensions updated:
modified docker-build.sh, add EventLogger to dummy processor
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
The following commit(s) were added to refs/heads/edge-extensions by this push:
new a1ae08c modified docker-build.sh, add EventLogger to dummy processor
a1ae08c is described below
commit a1ae08cb66b028bb7a77a42ad8bb5fdc0ecb061d
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Fri Jun 11 12:06:56 2021 +0200
modified docker-build.sh, add EventLogger to dummy processor
---
.idea/runConfigurations/node_controller_cloud.xml | 24 ----------------------
.../runConfigurations/node_controller_cloud_01.xml | 19 +++++++++++++++++
docker-build.sh | 4 ++--
streampipes-extensions-all-jvm/arm.Dockerfile | 9 ++++++--
.../jvm/processor/dummy/DummyController.java | 1 +
5 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/.idea/runConfigurations/node_controller_cloud.xml b/.idea/runConfigurations/node_controller_cloud.xml
deleted file mode 100644
index 9e7b465..0000000
--- a/.idea/runConfigurations/node_controller_cloud.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="node-controller-cloud" type="Application" factoryName="Application" folderName="node-controller">
- <envs>
- <env name="SP_BACKEND_HOST" value="host.docker.internal" />
- <env name="CONSUL_LOCATION" value="host.docker.internal" />
- <env name="SP_NODE_HOST" value="cloud.example.de" />
- <env name="SP_NODE_TYPE" value="cloud" />
- <env name="SP_NODE_CONTROLLER_ID" value="cloud.node-controller" />
- <env name="SP_NODE_CONTROLLER_CONTAINER_HOST" value="cloud.example.de" />
- <env name="SP_NODE_CONTROLLER_CONTAINER_PORT" value="7080" />
- <env name="SP_NODE_BROKER_CONTAINER_HOST" value="localhost" />
- <env name="SP_NODE_BROKER_CONTAINER_PORT" value="1888" />
- <env name="SP_NODE_HAS_GPU" value="true" />
- <env name="SP_NODE_TAGS" value="aws" />
- <env name="SP_DEBUG" value="true" />
- <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" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/node_controller_cloud_01.xml b/.idea/runConfigurations/node_controller_cloud_01.xml
new file mode 100644
index 0000000..666b678
--- /dev/null
+++ b/.idea/runConfigurations/node_controller_cloud_01.xml
@@ -0,0 +1,19 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="node-controller-cloud-01" type="Application" factoryName="Application" folderName="node-controller">
+ <envs>
+ <env name="SP_NODE_CONTROLLER_ID" value="cloud-01.node-controller" />
+ <env name="SP_NODE_BROKER_CONTAINER_PORT" value="1888" />
+ <env name="SP_NODE_TAGS" value="aws;frankfurt" />
+ <env name="SP_DEBUG" value="true" />
+ <env name="SP_URL" value="http://localhost:8030" />
+ <env name="SP_NODE_CONTROLLER_URL" value="http://cloud01.example.de:7080" />
+ <env name="SP_VERSION" value="0.68.0-SNAPSHOT" />
+ <env name="SP_HAS_GPU" value="true" />
+ </envs>
+ <option name="MAIN_CLASS_NAME" value="org.apache.streampipes.node.controller.NodeControllerInit" />
+ <module name="streampipes-node-controller" />
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/docker-build.sh b/docker-build.sh
index 88eded0..4f954d1 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -30,8 +30,8 @@ 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
+ -t $repo/$1:$version-armv7 \
+ -f $2/arm.Dockerfile $2 --load
}
docker_build_aarch64(){
diff --git a/streampipes-extensions-all-jvm/arm.Dockerfile b/streampipes-extensions-all-jvm/arm.Dockerfile
index a16eaad..f913a10 100644
--- a/streampipes-extensions-all-jvm/arm.Dockerfile
+++ b/streampipes-extensions-all-jvm/arm.Dockerfile
@@ -13,15 +13,20 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+
ARG BASE_IMAGE=arm32v7/openjdk:11-jre-slim
-FROM $BASE_IMAGE
+FROM arm32v7/ubuntu:18.04 as build-dev
+RUN apt -y update; \
+ apt -y --no-install-recommends install qemu-user-static
+
+FROM $BASE_IMAGE
MAINTAINER dev@streampipes.apache.org
ENV CONSUL_LOCATION consul
EXPOSE 8090
-COPY qemu-arm-static /usr/bin
+COPY --from=build-dev /usr/bin/qemu-arm-static /usr/bin
COPY target/streampipes-extensions-all-jvm.jar /streampipes-extensions-all-jvm.jar
ENTRYPOINT ["java", "-jar", "/streampipes-extensions-all-jvm.jar"]
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 f979611..dce8391 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
@@ -85,5 +85,6 @@ public class DummyController extends StreamPipesReconfigurableProcessor {
Object[] obs = {System.currentTimeMillis(), String.format("Dummy processor reconfigured with value %s", event.getFieldByRuntimeName("i-am-reconfigurable").getAsPrimitive().getAsDouble())};
EvaluationLogger.getInstance().addLine(obs);
reconfigurableValue = event.getFieldByRuntimeName("i-am-reconfigurable").getAsPrimitive().getAsDouble();
+ EvaluationLogger.getInstance().writeOut();
}
}