Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion runners/flink/job-server-container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,13 @@
FROM eclipse-temurin:11
MAINTAINER "Apache Beam <dev@beam.apache.org>"

RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y libltdl7
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y libltdl7 \
&& (keytool -list -keystore "${JAVA_HOME}/lib/security/cacerts" -storepass changeit \
| grep -iE "emsign|emudhra" \
| awk -F', ' '{print $1}' \
| while IFS= read -r alias; do \
keytool -delete -noprompt -alias "${alias}" -keystore "${JAVA_HOME}/lib/security/cacerts" -storepass changeit; \
done)

ADD beam-runners-flink-job-server.jar /opt/apache/beam/jars/
ADD flink-job-server.sh /opt/apache/beam/
Expand Down
8 changes: 7 additions & 1 deletion runners/spark/job-server/container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,13 @@
FROM eclipse-temurin:11
MAINTAINER "Apache Beam <dev@beam.apache.org>"

RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y libltdl7
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y libltdl7 \
&& (keytool -list -keystore "${JAVA_HOME}/lib/security/cacerts" -storepass changeit \
| grep -iE "emsign|emudhra" \
| awk -F', ' '{print $1}' \
| while IFS= read -r alias; do \
keytool -delete -noprompt -alias "${alias}" -keystore "${JAVA_HOME}/lib/security/cacerts" -storepass changeit; \
done)

ADD beam-runners-spark-job-server.jar /opt/apache/beam/jars/
ADD spark-job-server.sh /opt/apache/beam/
Expand Down
10 changes: 10 additions & 0 deletions sdks/java/container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,14 @@ RUN if [ "${pull_licenses}" = "false" ] ; then \
# Add Google Cloud Profiler agent.
COPY target/profiler/* /opt/google_cloud_profiler/

# Remove distrusted eMudhra / emSign root CA certificates from the JDK truststore.
RUN CACERTS="${JAVA_HOME}/lib/security/cacerts"; \
if [ ! -f "${CACERTS}" ]; then CACERTS="${JAVA_HOME}/jre/lib/security/cacerts"; fi; \
keytool -list -keystore "${CACERTS}" -storepass changeit \
| grep -iE "emsign|emudhra" \
| awk -F', ' '{print $1}' \
| while IFS= read -r alias; do \
keytool -delete -noprompt -alias "${alias}" -keystore "${CACERTS}" -storepass changeit; \
done

ENTRYPOINT ["/opt/apache/beam/boot"]
1 change: 1 addition & 0 deletions sdks/java/container/distroless/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ RUN if [ -z "${TARGETARCH}" ]; then echo "fatal: TARGETARCH not set; run as dock
FROM ${DISTROLESS_BASE}:latest-${TARGETARCH} AS distroless

COPY --from=base /opt /opt
COPY --from=base /opt/java/openjdk/lib/security/cacerts /etc/ssl/certs/java/cacerts

# Along with the LANG environment variable above, prevents internally discovered failing bugs related to Dataflow Flex
# template character encodings.
Expand Down
8 changes: 8 additions & 0 deletions sdks/java/expansion-service/container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,12 @@ RUN if [ "${pull_licenses}" = "false" ] ; then \
rm -rf /opt/apache/beam/third_party_licenses ; \
fi

# Remove distrusted eMudhra / emSign root CA certificates from the JDK truststore.
RUN keytool -list -keystore "${JAVA_HOME}/lib/security/cacerts" -storepass changeit \
| grep -iE "emsign|emudhra" \
| awk -F', ' '{print $1}' \
| while IFS= read -r alias; do \
keytool -delete -noprompt -alias "${alias}" -keystore "${JAVA_HOME}/lib/security/cacerts" -storepass changeit; \
done

ENTRYPOINT ["/opt/apache/beam/boot", "-config_file", "./expansion_service_config.yml", "-dependencies_dir", "jars/"]
8 changes: 8 additions & 0 deletions sdks/java/transform-service/controller-container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,12 @@ RUN if [ "${pull_licenses}" = "false" ] ; then \
rm -rf /opt/apache/beam/third_party_licenses ; \
fi

# Remove distrusted eMudhra / emSign root CA certificates from the JDK truststore.
RUN keytool -list -keystore "${JAVA_HOME}/lib/security/cacerts" -storepass changeit \
| grep -iE "emsign|emudhra" \
| awk -F', ' '{print $1}' \
| while IFS= read -r alias; do \
keytool -delete -noprompt -alias "${alias}" -keystore "${JAVA_HOME}/lib/security/cacerts" -storepass changeit; \
done

ENTRYPOINT ["./boot", "-config_file", "./transform_service_config.yml"]
2 changes: 1 addition & 1 deletion sdks/python/container/ml/py310/base_image_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ h5py==3.14.0
hf-xet==1.6.0
hpack==4.2.0
httpcore==1.0.9
httplib2==0.32.0
httplib2==0.32.1
httpx==0.28.1
huggingface_hub==0.36.2
hyperframe==6.1.0
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/container/ml/py310/gpu_image_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ h5py==3.14.0
hf-xet==1.6.0
hpack==4.2.0
httpcore==1.0.9
httplib2==0.32.0
httplib2==0.32.1
httptools==0.8.0
httpx==0.28.1
huggingface_hub==0.36.2
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/container/ml/py311/base_image_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ h5py==3.14.0
hf-xet==1.6.0
hpack==4.2.0
httpcore==1.0.9
httplib2==0.32.0
httplib2==0.32.1
httpx==0.28.1
huggingface_hub==0.36.2
hyperframe==6.1.0
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/container/ml/py311/gpu_image_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ h5py==3.14.0
hf-xet==1.6.0
hpack==4.2.0
httpcore==1.0.9
httplib2==0.32.0
httplib2==0.32.1
httptools==0.8.0
httpx==0.28.1
huggingface_hub==0.36.2
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/container/ml/py312/base_image_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ h5py==3.14.0
hf-xet==1.6.0
hpack==4.2.0
httpcore==1.0.9
httplib2==0.32.0
httplib2==0.32.1
httpx==0.28.1
huggingface_hub==0.36.2
hyperframe==6.1.0
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/container/ml/py312/gpu_image_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ h5py==3.14.0
hf-xet==1.6.0
hpack==4.2.0
httpcore==1.0.9
httplib2==0.32.0
httplib2==0.32.1
httptools==0.8.0
httpx==0.28.1
huggingface_hub==0.36.2
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/container/ml/py313/base_image_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ h5py==3.14.0
hf-xet==1.6.0
hpack==4.2.0
httpcore==1.0.9
httplib2==0.32.0
httplib2==0.32.1
httpx==0.28.1
huggingface_hub==0.36.2
hyperframe==6.1.0
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/container/py310/base_image_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ h11==0.16.0
h2==4.4.1
hpack==4.2.0
httpcore==1.0.9
httplib2==0.32.0
httplib2==0.32.1
httpx==0.28.1
hyperframe==6.1.0
hypothesis==6.148.3
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/container/py311/base_image_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ h11==0.16.0
h2==4.4.1
hpack==4.2.0
httpcore==1.0.9
httplib2==0.32.0
httplib2==0.32.1
httpx==0.28.1
hyperframe==6.1.0
hypothesis==6.148.3
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/container/py312/base_image_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ h11==0.16.0
h2==4.4.1
hpack==4.2.0
httpcore==1.0.9
httplib2==0.32.0
httplib2==0.32.1
httpx==0.28.1
hyperframe==6.1.0
hypothesis==6.148.3
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/container/py313/base_image_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ h11==0.16.0
h2==4.4.1
hpack==4.2.0
httpcore==1.0.9
httplib2==0.32.0
httplib2==0.32.1
httpx==0.28.1
hyperframe==6.1.0
hypothesis==6.148.3
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/container/py314/base_image_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ h11==0.16.0
h2==4.4.1
hpack==4.2.0
httpcore==1.0.9
httplib2==0.32.0
httplib2==0.32.1
httpx==0.28.1
hyperframe==6.1.0
hypothesis==6.148.3
Expand Down
Loading