[ci] Unblock CI temporary by moving to OpenJDK instead of Temurin (#659)

LangStream · Oct 27, 2023 · c106621 · c106621
1 parent eec9581
commit c106621
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 20 deletions.
diff --git a/langstream-cli/src/main/docker/Dockerfile b/langstream-cli/src/main/docker/Dockerfile
@@ -20,21 +20,14 @@ FROM ubuntu:22.04
 ARG DEBIAN_FRONTEND=noninteractive
 
 # Install some utilities
-RUN echo 'Acquire::http::Timeout "30";\nAcquire::ftp::Timeout "30";\nAcquire::Retries "3";' > /etc/apt/apt.conf.d/99timeout_and_retries \
+RUN echo 'Acquire::http::Timeout "30";\nAcquire::ftp::Timeout  "30";\nAcquire::Retries "3";' > /etc/apt/apt.conf.d/99timeout_and_retries \
      && apt-get update \
      && apt-get -y dist-upgrade \
      && apt-get -y install --no-install-recommends vim netcat dnsutils net-tools less procps iputils-ping zip unzip git jq \
                  curl ca-certificates wget apt-transport-https software-properties-common gpg-agent
 
-# Install Eclipse Temurin Package
-RUN mkdir -p /etc/apt/keyrings \
-     && wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | tee /etc/apt/keyrings/adoptium.asc \
-     && echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list \
-     && apt-get update \
-     && apt-get -y dist-upgrade \
-     && apt-get -y install temurin-17-jdk \
-     && export ARCH=$(uname -m | sed -r 's/aarch64/arm64/g' |  awk '!/arm64/{$0="amd64"}1') \
-     && echo networkaddress.cache.ttl=1 >> /usr/lib/jvm/temurin-17-jdk-$ARCH/conf/security/java.security \
+RUN  apt-get update && apt-get -y install openjdk-17-jdk
+
 
 # Cleanup apt
 RUN apt-get -y --purge autoremove \

diff --git a/langstream-runtime/langstream-runtime-base-docker-image/src/main/docker/Dockerfile b/langstream-runtime/langstream-runtime-base-docker-image/src/main/docker/Dockerfile
@@ -33,17 +33,10 @@ RUN apt-get update && add-apt-repository ppa:deadsnakes/ppa \
       && python3 -m ensurepip && python3 -m pip install pipenv
 
 
-# Install Eclipse Temurin Package
-RUN mkdir -p /etc/apt/keyrings \
-     && wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | tee /etc/apt/keyrings/adoptium.asc \
-     && echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list \
-     && apt-get update \
-     && apt-get -y dist-upgrade \
-     && apt-get -y install temurin-17-jdk \
-     && export ARCH=$(uname -m | sed -r 's/aarch64/arm64/g' |  awk '!/arm64/{$0="amd64"}1') \
-     && echo networkaddress.cache.ttl=1 >> /usr/lib/jvm/temurin-17-jdk-$ARCH/conf/security/java.security
+RUN apt-get update \
+     && apt-get -y install openjdk-17-jdk
 
-# Install utility packages for Python unstructured data processing
+    # Install utility packages for Python unstructured data processing
 RUN apt-get update && apt-get -y install --no-install-recommends libmagic-dev poppler-utils tesseract-ocr libreoffice pandoc
 
 # Cleanup apt