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 2020/02/19 22:37:43 UTC
[incubator-streampipes] branch dev updated: moved Dockerfile ARG
after FROM
This is an automated email from the ASF dual-hosted git repository.
wiener pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 5cb78e1 moved Dockerfile ARG after FROM
new 82c59d7 Merge branch 'dev' of https://github.com/apache/incubator-streampipes into dev
5cb78e1 is described below
commit 5cb78e19c3e1d1e768023ceef0d1642acc13dc52
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Wed Feb 19 23:37:02 2020 +0100
moved Dockerfile ARG after FROM
---
streampipes-backend/Dockerfile | 2 +-
streampipes-backend/aarch64.Dockerfile | 6 +++---
streampipes-backend/arm.Dockerfile | 6 +++---
streampipes-connect-container-master/Dockerfile | 2 +-
streampipes-connect-container-master/aarch64.Dockerfile | 6 +++---
streampipes-connect-container-master/arm.Dockerfile | 6 +++---
ui/Dockerfile | 2 +-
ui/aarch64.Dockerfile | 5 +++--
ui/arm.Dockerfile | 5 +++--
9 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/streampipes-backend/Dockerfile b/streampipes-backend/Dockerfile
index 1f03556..3ab1660 100644
--- a/streampipes-backend/Dockerfile
+++ b/streampipes-backend/Dockerfile
@@ -14,7 +14,7 @@
# limitations under the License.
ARG BASE_IMAGE=adoptopenjdk/openjdk8-openj9:alpine-slim
-FROM ${BASE_IMAGE}
+FROM $BASE_IMAGE
EXPOSE 8030
ENV CONSUL_LOCATION consul
diff --git a/streampipes-backend/aarch64.Dockerfile b/streampipes-backend/aarch64.Dockerfile
index 10717bd..0406331 100644
--- a/streampipes-backend/aarch64.Dockerfile
+++ b/streampipes-backend/aarch64.Dockerfile
@@ -14,14 +14,14 @@
# limitations under the License.
ARG BASE_IMAGE=arm64v8/openjdk:11-jre-slim
-ARG QEMU=qemu-aarch64-static
-FROM ${BASE_IMAGE}
+FROM $BASE_IMAGE
+ARG QEMU=qemu-aarch64-static
ENV CONSUL_LOCATION consul
EXPOSE 8030
-COPY ${QEMU} /usr/bin
+COPY $QEMU /usr/bin
COPY target/streampipes-backend.jar /streampipes-backend.jar
ENTRYPOINT ["java", "-jar", "/streampipes-backend.jar"]
diff --git a/streampipes-backend/arm.Dockerfile b/streampipes-backend/arm.Dockerfile
index 2cf867e..912ff90 100644
--- a/streampipes-backend/arm.Dockerfile
+++ b/streampipes-backend/arm.Dockerfile
@@ -14,14 +14,14 @@
# limitations under the License.
ARG BASE_IMAGE=arm32v7/openjdk:11-jre-slim
-ARG QEMU=qemu-arm-static
-FROM ${BASE_IMAGE}
+FROM $BASE_IMAGE
+ARG QEMU=qemu-arm-static
ENV CONSUL_LOCATION consul
EXPOSE 8030
-COPY ${QEMU} /usr/bin
+COPY $QEMU /usr/bin
COPY target/streampipes-backend.jar /streampipes-backend.jar
ENTRYPOINT ["java", "-jar", "/streampipes-backend.jar"]
diff --git a/streampipes-connect-container-master/Dockerfile b/streampipes-connect-container-master/Dockerfile
index 7b05144..bc6d4d7 100644
--- a/streampipes-connect-container-master/Dockerfile
+++ b/streampipes-connect-container-master/Dockerfile
@@ -14,7 +14,7 @@
# limitations under the License.
ARG BASE_IMAGE=adoptopenjdk/openjdk8-openj9:alpine-slim
-FROM ${BASE_IMAGE}
+FROM $BASE_IMAGE
ENV CONSUL_LOCATION consul
diff --git a/streampipes-connect-container-master/aarch64.Dockerfile b/streampipes-connect-container-master/aarch64.Dockerfile
index 36d841c..1f1390a 100644
--- a/streampipes-connect-container-master/aarch64.Dockerfile
+++ b/streampipes-connect-container-master/aarch64.Dockerfile
@@ -14,14 +14,14 @@
# limitations under the License.
ARG BASE_IMAGE=arm64v8/openjdk:11-jre-slim
-ARG QEMU=qemu-aarch64-static
-FROM ${BASE_IMAGE}
+FROM $BASE_IMAGE
+ARG QEMU=qemu-aarch64-static
ENV CONSUL_LOCATION consul
EXPOSE 8099
-COPY ${QEMU} /usr/bin
+COPY $QEMU /usr/bin
COPY target/streampipes-connect-container-master.jar /streampipes-connect-container-master.jar
ENTRYPOINT ["java", "-jar", "/streampipes-connect-container-master.jar"]
diff --git a/streampipes-connect-container-master/arm.Dockerfile b/streampipes-connect-container-master/arm.Dockerfile
index daba9bf..a7aa75d 100644
--- a/streampipes-connect-container-master/arm.Dockerfile
+++ b/streampipes-connect-container-master/arm.Dockerfile
@@ -14,14 +14,14 @@
# limitations under the License.
ARG BASE_IMAGE=arm32v7/openjdk:11-jre-slim
-ARG QEMU=qemu-arm-static
-FROM ${BASE_IMAGE}
+FROM $BASE_IMAGE
+ARG QEMU=qemu-arm-static
ENV CONSUL_LOCATION consul
EXPOSE 8099
-COPY ${QEMU} /usr/bin
+COPY $QEMU /usr/bin
COPY target/streampipes-connect-container-master.jar /streampipes-connect-container-master.jar
ENTRYPOINT ["java", "-jar", "/streampipes-connect-container-master.jar"]
diff --git a/ui/Dockerfile b/ui/Dockerfile
index a7fbe69..173aea2 100644
--- a/ui/Dockerfile
+++ b/ui/Dockerfile
@@ -14,7 +14,7 @@
# limitations under the License.
ARG BASE_IMAGE=nginx
-FROM ${BASE_IMAGE}
+FROM $BASE_IMAGE
COPY dist/ /usr/share/nginx/html/
#COPY dist/assets/img/ /usr/share/nginx/html/assets/img/
diff --git a/ui/aarch64.Dockerfile b/ui/aarch64.Dockerfile
index 3e8600f..de451a8 100644
--- a/ui/aarch64.Dockerfile
+++ b/ui/aarch64.Dockerfile
@@ -14,10 +14,11 @@
# limitations under the License.
ARG BASE_IMAGE=arm64v8/nginx
+FROM $BASE_IMAGE
+
ARG QEMU=qemu-aarch64-static
-FROM ${BASE_IMAGE}
-COPY ${QEMU} /usr/bin
+COPY $QEMU /usr/bin
COPY dist/ /usr/share/nginx/html/
#COPY dist/assets/img/ /usr/share/nginx/html/assets/img/
diff --git a/ui/arm.Dockerfile b/ui/arm.Dockerfile
index 898d3c5..d17eb51 100644
--- a/ui/arm.Dockerfile
+++ b/ui/arm.Dockerfile
@@ -14,10 +14,11 @@
# limitations under the License.
ARG BASE_IMAGE=arm32v7/nginx
+FROM $BASE_IMAGE
+
ARG QEMU=qemu-arm-static
-FROM ${BASE_IMAGE}
-COPY ${QEMU} /usr/bin
+COPY $QEMU /usr/bin
COPY dist/ /usr/share/nginx/html/
#COPY dist/assets/img/ /usr/share/nginx/html/assets/img/