Add proxy build argument to dockerfiles (#533)

* Add proxy build argument to dockerfiles * Fix missing newline
eclipse-basyx · Dec 7, 2024 · ac705f5 · ac705f5
1 parent f51da9e
commit ac705f5
Show file tree

Hide file tree

Showing 22 changed files with 64 additions and 3 deletions.
diff --git a/basyx.aasdiscoveryservice/basyx.aasdiscoveryservice.component/Dockerfile b/basyx.aasdiscoveryservice/basyx.aasdiscoveryservice.component/Dockerfile
@@ -1,4 +1,6 @@
 FROM eclipse-temurin:17
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 USER nobody
 WORKDIR /application
 ARG JAR_FILE=target/*-exec.jar

diff --git a/basyx.aasenvironment/basyx.aasenvironment.component/Dockerfile b/basyx.aasenvironment/basyx.aasenvironment.component/Dockerfile
@@ -1,4 +1,6 @@
 FROM eclipse-temurin:17
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 USER nobody
 WORKDIR /application
 ARG JAR_FILE=target/*-exec.jar

diff --git a/basyx.aasregistry/basyx.aasregistry-service-release-kafka-mem/src/main/docker/Dockerfile b/basyx.aasregistry/basyx.aasregistry-service-release-kafka-mem/src/main/docker/Dockerfile
@@ -1,4 +1,6 @@
 FROM eclipse-temurin:17 as builder
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 ARG FINAL_NAME=${project.build.finalName}
 COPY maven/${FINAL_NAME}.jar ./
 RUN java -Djarmode=layertools -jar ${FINAL_NAME}.jar extract

diff --git a/basyx.aasregistry/basyx.aasregistry-service-release-kafka-mongodb/src/main/docker/Dockerfile b/basyx.aasregistry/basyx.aasregistry-service-release-kafka-mongodb/src/main/docker/Dockerfile
@@ -1,9 +1,13 @@
 FROM eclipse-temurin:17 as builder
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 ARG FINAL_NAME=${project.build.finalName}
 COPY maven/${FINAL_NAME}.jar ./
 RUN java -Djarmode=layertools -jar ${FINAL_NAME}.jar extract
 
 FROM eclipse-temurin:17
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 RUN mkdir /workspace
 WORKDIR /workspace
 COPY --from=builder dependencies/ ./

diff --git a/basyx.aasregistry/basyx.aasregistry-service-release-log-mem/src/main/docker/Dockerfile b/basyx.aasregistry/basyx.aasregistry-service-release-log-mem/src/main/docker/Dockerfile
@@ -1,9 +1,13 @@
 FROM eclipse-temurin:17 as builder
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 ARG FINAL_NAME=${project.build.finalName}
 COPY maven/${FINAL_NAME}.jar ./
 RUN java -Djarmode=layertools -jar ${FINAL_NAME}.jar extract
 
 FROM eclipse-temurin:17
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 RUN mkdir /workspace
 WORKDIR /workspace
 COPY --from=builder dependencies/ ./

diff --git a/basyx.aasregistry/basyx.aasregistry-service-release-log-mongodb/src/main/docker/Dockerfile b/basyx.aasregistry/basyx.aasregistry-service-release-log-mongodb/src/main/docker/Dockerfile
@@ -1,9 +1,13 @@
 FROM eclipse-temurin:17 as builder
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 ARG FINAL_NAME=${project.build.finalName}
 COPY maven/${FINAL_NAME}.jar ./
 RUN java -Djarmode=layertools -jar ${FINAL_NAME}.jar extract
 
 FROM eclipse-temurin:17
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 RUN mkdir /workspace
 WORKDIR /workspace
 COPY --from=builder dependencies/ ./

diff --git a/basyx.aasrepository/basyx.aasrepository.component/Dockerfile b/basyx.aasrepository/basyx.aasrepository.component/Dockerfile
@@ -1,4 +1,6 @@
 FROM eclipse-temurin:17
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 USER nobody
 WORKDIR /application
 ARG JAR_FILE=target/*-exec.jar

diff --git a/basyx.aasxfileserver/basyx.aasxfileserver.component/Dockerfile b/basyx.aasxfileserver/basyx.aasxfileserver.component/Dockerfile
@@ -1,4 +1,6 @@
 FROM eclipse-temurin:17
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 USER nobody
 WORKDIR /application
 ARG JAR_FILE=target/*-exec.jar

diff --git a/basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository.component/Dockerfile b/basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository.component/Dockerfile
@@ -1,4 +1,6 @@
 FROM eclipse-temurin:17
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 USER nobody
 WORKDIR /application
 ARG JAR_FILE=target/*-exec.jar

diff --git a/...modelregistry/basyx.submodelregistry-service-release-kafka-mem/src/main/docker/Dockerfile b/...modelregistry/basyx.submodelregistry-service-release-kafka-mem/src/main/docker/Dockerfile
@@ -1,9 +1,13 @@
 FROM eclipse-temurin:17 as builder
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 ARG FINAL_NAME=${project.build.finalName}
 COPY maven/${FINAL_NAME}.jar ./
 RUN java -Djarmode=layertools -jar ${FINAL_NAME}.jar extract
 
 FROM eclipse-temurin:17
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 RUN mkdir /workspace
 WORKDIR /workspace
 COPY --from=builder dependencies/ ./

diff --git a/...lregistry/basyx.submodelregistry-service-release-kafka-mongodb/src/main/docker/Dockerfile b/...lregistry/basyx.submodelregistry-service-release-kafka-mongodb/src/main/docker/Dockerfile
@@ -1,9 +1,13 @@
 FROM eclipse-temurin:17 as builder
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 ARG FINAL_NAME=${project.build.finalName}
 COPY maven/${FINAL_NAME}.jar ./
 RUN java -Djarmode=layertools -jar ${FINAL_NAME}.jar extract
 
 FROM eclipse-temurin:17
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 RUN mkdir /workspace
 WORKDIR /workspace
 COPY --from=builder dependencies/ ./

diff --git a/...ubmodelregistry/basyx.submodelregistry-service-release-log-mem/src/main/docker/Dockerfile b/...ubmodelregistry/basyx.submodelregistry-service-release-log-mem/src/main/docker/Dockerfile
@@ -1,9 +1,13 @@
 FROM eclipse-temurin:17 as builder
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 ARG FINAL_NAME=${project.build.finalName}
 COPY maven/${FINAL_NAME}.jar ./
 RUN java -Djarmode=layertools -jar ${FINAL_NAME}.jar extract
 
 FROM eclipse-temurin:17
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 RUN mkdir /workspace
 WORKDIR /workspace
 COPY --from=builder dependencies/ ./

diff --git a/...delregistry/basyx.submodelregistry-service-release-log-mongodb/src/main/docker/Dockerfile b/...delregistry/basyx.submodelregistry-service-release-log-mongodb/src/main/docker/Dockerfile
@@ -1,9 +1,13 @@
 FROM eclipse-temurin:17 as builder
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 ARG FINAL_NAME=${project.build.finalName}
 COPY maven/${FINAL_NAME}.jar ./
 RUN java -Djarmode=layertools -jar ${FINAL_NAME}.jar extract
 
 FROM eclipse-temurin:17
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 RUN mkdir /workspace
 WORKDIR /workspace
 COPY --from=builder dependencies/ ./

diff --git a/basyx.submodelrepository/basyx.submodelrepository.component/Dockerfile b/basyx.submodelrepository/basyx.submodelrepository.component/Dockerfile
@@ -1,4 +1,6 @@
 FROM eclipse-temurin:17
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 USER nobody
 WORKDIR /application
 ARG JAR_FILE=target/*-exec.jar

diff --git a/basyx.submodelservice/basyx.submodelservice.example/Dockerfile b/basyx.submodelservice/basyx.submodelservice.example/Dockerfile
@@ -1,4 +1,6 @@
 FROM eclipse-temurin:17
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 USER nobody
 WORKDIR /application
 ARG JAR_FILE=target/*-exec.jar

diff --git a/ci/keycloak/Dockerfile b/ci/keycloak/Dockerfile
@@ -1,5 +1,6 @@
 FROM quay.io/keycloak/keycloak:22.0.0
-
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 # Make the realm configuration available for import
 COPY /realm/BaSyx-realm.json /opt/keycloak_import/
 

diff --git a/ci/keycloak/Dockerfile.keycloak b/ci/keycloak/Dockerfile.keycloak
@@ -1,12 +1,16 @@
 # syntax=docker/dockerfile:1
 FROM maven:3-eclipse-temurin-17-alpine as build
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 WORKDIR /workspace
 COPY ./initializer/pom.xml /workspace/pom.xml
 COPY ./initializer/src /workspace/src
 COPY ./realm/BaSyx-realm.json /workspace/BaSyx-realm.json
 RUN mvn install
 
 FROM keycloak/keycloak:24.0.4
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 COPY --from=build /workspace/target/org.eclipse.digitaltwin.basyx.v3.clients-keycloak-issuer-initializer.jar /opt/keycloak/providers/issuer-initializer.jar
 COPY --from=build /workspace/BaSyx-realm.json /opt/keycloak/data/import/BaSyx-realm.json
 

diff --git a/examples/BaSyxClient/basyx-client/Dockerfile b/examples/BaSyxClient/basyx-client/Dockerfile
@@ -1,10 +1,14 @@
 FROM maven:3.8.1-openjdk-17 AS build
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 WORKDIR /app
 COPY pom.xml .
 COPY src src
 RUN mvn clean package -DskipTests
 
 FROM openjdk:17
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 WORKDIR /app
 COPY --from=build /app/target/*-jar-with-dependencies.jar app.jar
 ENTRYPOINT ["java", "-jar", "app.jar"]
diff --git a/examples/BaSyxClient/legacy-erp/Dockerfile b/examples/BaSyxClient/legacy-erp/Dockerfile
@@ -1,5 +1,6 @@
 FROM python:3.10-slim
-
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 WORKDIR /app
 
 COPY . /app

diff --git a/examples/BaSyxDatabridge/mqtt-publisher/Dockerfile b/examples/BaSyxDatabridge/mqtt-publisher/Dockerfile
@@ -1,5 +1,6 @@
 FROM python:3.8-slim
-
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 RUN pip install paho-mqtt
 
 COPY publisher.py /publisher.py

diff --git a/examples/BaSyxOperationDelegation/exampleOperationService/Dockerfile b/examples/BaSyxOperationDelegation/exampleOperationService/Dockerfile
@@ -1,5 +1,7 @@
 # Stage 1: Build Stage
 FROM maven:3.8.1-openjdk-17 AS build
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 WORKDIR /app
 # Kopiere die pom.xml und lade die Abhängigkeiten herunter
 COPY pom.xml .
@@ -11,6 +13,8 @@ RUN mvn clean package -DskipTests
 
 # Stage 2: Runtime Stage
 FROM openjdk:17
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 WORKDIR /app
 COPY --from=build /app/target/*.jar app.jar
 EXPOSE 8080

diff --git a/examples/BaSyxSecured/keycloak/Dockerfile b/examples/BaSyxSecured/keycloak/Dockerfile
@@ -1,5 +1,7 @@
 # syntax=docker/dockerfile:1
 FROM maven:3-eclipse-temurin-17 AS build
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
 WORKDIR /workspace
 COPY ./initializer/pom.xml /workspace/pom.xml
 COPY ./initializer/src /workspace/src