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 20dc24450490e53f5f098d1ede1a4ede5ba45b56 Author: Patrick Wiener <[email protected]> AuthorDate: Fri Apr 9 11:42:17 2021 +0200 [WIP] update run configs and modified arm64 Dockerfile for testing --- .idea/runConfigurations/node_controller_cloud.xml | 2 +- .idea/runConfigurations/node_controller_edge_01.xml | 2 +- .idea/runConfigurations/node_controller_edge_02.xml | 2 +- .idea/runConfigurations/node_controller_fog.xml | 2 +- .../aarch64.Dockerfile => build-docker.sh | 21 ++++++++++++--------- streampipes-extensions-all-jvm/aarch64.Dockerfile | 9 +++++++-- 6 files changed, 23 insertions(+), 15 deletions(-) diff --git a/.idea/runConfigurations/node_controller_cloud.xml b/.idea/runConfigurations/node_controller_cloud.xml index a1e704f..4aa77b5 100644 --- a/.idea/runConfigurations/node_controller_cloud.xml +++ b/.idea/runConfigurations/node_controller_cloud.xml @@ -1,6 +1,6 @@ <component name="ProjectRunConfigurationManager"> <configuration default="false" name="node-controller-cloud" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" folderName="edge-extensions"> - <module name="streampipes-node-controller-container" /> + <module name="streampipes-node-controller" /> <option name="SPRING_BOOT_MAIN_CLASS" value="org.apache.streampipes.node.controller.container.NodeControllerInit" /> <option name="ALTERNATIVE_JRE_PATH" /> <envs> diff --git a/.idea/runConfigurations/node_controller_edge_01.xml b/.idea/runConfigurations/node_controller_edge_01.xml index fce3f4c..0bbfe95 100644 --- a/.idea/runConfigurations/node_controller_edge_01.xml +++ b/.idea/runConfigurations/node_controller_edge_01.xml @@ -1,6 +1,6 @@ <component name="ProjectRunConfigurationManager"> <configuration default="false" name="node-controller-edge-01" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" folderName="edge-extensions"> - <module name="streampipes-node-controller-container" /> + <module name="streampipes-node-controller" /> <option name="SPRING_BOOT_MAIN_CLASS" value="org.apache.streampipes.node.controller.container.NodeControllerInit" /> <option name="ALTERNATIVE_JRE_PATH" /> <envs> diff --git a/.idea/runConfigurations/node_controller_edge_02.xml b/.idea/runConfigurations/node_controller_edge_02.xml index 6aae2c3..879ba41 100644 --- a/.idea/runConfigurations/node_controller_edge_02.xml +++ b/.idea/runConfigurations/node_controller_edge_02.xml @@ -1,6 +1,6 @@ <component name="ProjectRunConfigurationManager"> <configuration default="false" name="node-controller-edge-02" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" folderName="edge-extensions"> - <module name="streampipes-node-controller-container" /> + <module name="streampipes-node-controller" /> <option name="SPRING_BOOT_MAIN_CLASS" value="org.apache.streampipes.node.controller.container.NodeControllerInit" /> <option name="ALTERNATIVE_JRE_PATH" /> <envs> diff --git a/.idea/runConfigurations/node_controller_fog.xml b/.idea/runConfigurations/node_controller_fog.xml index f64259f..26289d8 100644 --- a/.idea/runConfigurations/node_controller_fog.xml +++ b/.idea/runConfigurations/node_controller_fog.xml @@ -1,6 +1,6 @@ <component name="ProjectRunConfigurationManager"> <configuration default="false" name="node-controller-fog" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" folderName="edge-extensions"> - <module name="streampipes-node-controller-container" /> + <module name="streampipes-node-controller" /> <option name="SPRING_BOOT_MAIN_CLASS" value="org.apache.streampipes.node.controller.container.NodeControllerInit" /> <option name="ALTERNATIVE_JRE_PATH" /> <envs> diff --git a/streampipes-extensions-all-jvm/aarch64.Dockerfile b/build-docker.sh old mode 100644 new mode 100755 similarity index 66% copy from streampipes-extensions-all-jvm/aarch64.Dockerfile copy to build-docker.sh index 3063f48..9f1e7d3 --- a/streampipes-extensions-all-jvm/aarch64.Dockerfile +++ b/build-docker.sh @@ -1,3 +1,4 @@ +#!/bin/sh # 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. @@ -13,15 +14,17 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG BASE_IMAGE=arm64v8/openjdk:11-jre-slim -FROM $BASE_IMAGE +#!/usr/bin/env bash -MAINTAINER [email protected] +repo=apachestreampipes +version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) -ENV CONSUL_LOCATION consul -EXPOSE 8090 +docker_build(){ + docker build --no-cache --pull \ + -t $repo/$1:$version \ + -f $2/Dockerfile $2 +} -COPY qemu-aarch64-static /usr/bin -COPY target/streampipes-extensions-all-jvm.jar /streampipes-extensions-all-jvm.jar - -ENTRYPOINT ["java", "-jar", "/streampipes-extensions-all-jvm.jar"] +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 diff --git a/streampipes-extensions-all-jvm/aarch64.Dockerfile b/streampipes-extensions-all-jvm/aarch64.Dockerfile index 3063f48..7d78d2a 100644 --- a/streampipes-extensions-all-jvm/aarch64.Dockerfile +++ b/streampipes-extensions-all-jvm/aarch64.Dockerfile @@ -14,14 +14,19 @@ # limitations under the License. ARG BASE_IMAGE=arm64v8/openjdk:11-jre-slim + +FROM arm64v8/ubuntu:18.04 as build-dev +RUN apt -y update; \ + apt -y --no-install-recommends install qemu-user-static + +ARG BASE_IMAGE=arm64v8/openjdk:11-jre-slim FROM $BASE_IMAGE MAINTAINER [email protected] - ENV CONSUL_LOCATION consul EXPOSE 8090 -COPY qemu-aarch64-static /usr/bin +COPY --from=build-dev /usr/bin/qemu-aarch64-static /usr/bin COPY target/streampipes-extensions-all-jvm.jar /streampipes-extensions-all-jvm.jar ENTRYPOINT ["java", "-jar", "/streampipes-extensions-all-jvm.jar"]
