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.git
commit 47729b95cfa285f0eed58633e56c2a8e43302500 Author: Patrick Wiener <[email protected]> AuthorDate: Mon Apr 12 10:01:54 2021 +0200 added multi-docker stage build for arm --- streampipes-node-controller/arm.Dockerfile | 8 +++++-- streampipes-node-controller/development/env | 35 ----------------------------- 2 files changed, 6 insertions(+), 37 deletions(-) diff --git a/streampipes-node-controller/arm.Dockerfile b/streampipes-node-controller/arm.Dockerfile index cd03e23..cff0520 100644 --- a/streampipes-node-controller/arm.Dockerfile +++ b/streampipes-node-controller/arm.Dockerfile @@ -14,14 +14,18 @@ # 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 [email protected] EXPOSE 7077 ENV CONSUL_LOCATION consul -COPY qemu-arm-static /usr/bin +COPY --from=build-dev /usr/bin/qemu-arm-static /usr/bin RUN set -ex; \ apt -y update; \ apt -y --no-install-recommends install libjffi-jni curl; \ diff --git a/streampipes-node-controller/development/env b/streampipes-node-controller/development/env deleted file mode 100644 index 8a9c1a5..0000000 --- a/streampipes-node-controller/development/env +++ /dev/null @@ -1,35 +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. - -# Those parameters are used by IntelliJ to set the default consul parameters for development -SP_BACKEND_HOST=host.docker.internal -CONSUL_LOCATION=host.docker.internal -SP_NODE_CONTROLLER_ID=edge.node-controller -SP_NODE_CONTROLLER_PORT=7077 -SP_NODE_HOST=edge.node -SP_NODE_LOCATION_FACTORY=fzi -SP_NODE_LOCATION_BUILDING=holl -SP_NODE_LOCATION_MACHINE=universalrobot -SP_NODE_ACCESSIBLE_SENSOR_ACTUATOR_RASPICAM=raspicam;sensor;/dev/video0;csi -SP_NODE_ACCESSIBLE_SENSOR_ACTUATOR_ZED=zed;sensor;/dev/video1;usb -SP_NODE_ACCESSIBLE_SENSOR_ACTUATOR_ROS=ros;universalrobot;192.168.0.80;network -SP_NODE_SUPPORTED_PE_APP_ID_FILTER=org.apache.streampipes.processors.filters.jvm.numericalfilter -SP_NODE_SUPPORTED_PE_APP_ID_ENRICH=org.apache.streampipes.processors.filters.jvm.enrich -SP_NODE_SUPPORTED_PE_APP_ID_STATS=org.streampipes.pe.ptrocessors.internal.universalrobot.statscollector -SP_NODE_SUPPORTED_PE_APP_ID_KPI=org.streampipes.pe.processors.internal.universalrobot.kpi -SP_NODE_SUPPORTED_PE_APP_ID_ROSSINK=org.streampipes.pe.sinks.internal.universalrobot.ros -SP_NODE_HAS_GPU=false -SP_DOCKER_PRUNING_FREQ_SECS=30 -SP_NODE_RESOURCE_UPDATE_FREQ_SECS=5 \ No newline at end of file
