From 1095ef5afe2c22c82c2d6f20b2f9606321916df4 Mon Sep 17 00:00:00 2001 From: "Paul S. Schweigert" Date: Fri, 26 Jul 2024 10:30:20 -0400 Subject: [PATCH 1/2] update ubi base image, drop legacy ray node Signed-off-by: Paul S. Schweigert --- Dockerfile-ray-node | 2 +- Dockerfile-ray-node-community | 48 ----------------------------------- gateway/Dockerfile | 2 +- 3 files changed, 2 insertions(+), 50 deletions(-) delete mode 100644 Dockerfile-ray-node-community diff --git a/Dockerfile-ray-node b/Dockerfile-ray-node index 58dab2a82..ce5e14beb 100644 --- a/Dockerfile-ray-node +++ b/Dockerfile-ray-node @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9-minimal:9.4-1134 +FROM registry.access.redhat.com/ubi9-minimal:9.4-1194 RUN microdnf install -y python3.11-3.11.7 python3.11-pip-22.3.1 python3.11-devel-3.11.7 vim-enhanced-8.2.2637 wget-1.21.1 &&\ microdnf clean all RUN ln -s /usr/bin/python3.11 /usr/local/bin/python3 && \ diff --git a/Dockerfile-ray-node-community b/Dockerfile-ray-node-community deleted file mode 100644 index 387d648a4..000000000 --- a/Dockerfile-ray-node-community +++ /dev/null @@ -1,48 +0,0 @@ -ARG IMAGE_PY_VERSION=py311 - -FROM rayproject/ray:2.30.0-$IMAGE_PY_VERSION AS ray-node-amd64 - -WORKDIR / -USER 0 -RUN mkdir /data && chown "$RAY_UID":"$RAY_UID" /data -USER $RAY_UID -COPY --chown=$RAY_UID:$RAY_UID ./client ./qs - -WORKDIR /qs -# TODO: certifi version pinned to 2024.7.4. More info in #421 -# TODO: pyarrow version pinned to 14.0.1 -RUN pip install . --no-cache-dir &&\ - pip install --no-cache-dir pyarrow==14.0.1 &&\ - pip install --no-cache-dir certifi==2024.7.4 - -WORKDIR / -RUN rm -r ./qs - -FROM rayproject/ray:2.30.0-$IMAGE_PY_VERSION-aarch64 AS ray-node-arm64 - -WORKDIR / -USER 0 -RUN mkdir /data && chown "$RAY_UID":"$RAY_UID" /data -USER $RAY_UID -RUN apt-get -y update &&\ - apt-get install --no-install-recommends -y \ - gcc=4:9.3.0-1ubuntu2 \ - build-essential=12.8ubuntu1 -COPY --chown=$RAY_UID:$RAY_UID ./client ./qs - -WORKDIR /qs -# TODO: certifi version pinned to 2024.7.4. More info in #421 -# TODO: pyarrow version pinned to 14.0.1 -RUN pip install . --no-cache-dir &&\ - pip install --no-cache-dir pyarrow==14.0.1 &&\ - if [ "$TARGETARCH" = "arm64" ] ; \ - then pip install --no-cache-dir certifi==2024.7.4 ; \ - fi - -WORKDIR / -USER 0 -RUN rm -r ./qs -USER $RAY_UID - -# hadolint ignore=DL3006 -FROM ray-node-${TARGETARCH} AS final diff --git a/gateway/Dockerfile b/gateway/Dockerfile index cffb86850..fdb942504 100644 --- a/gateway/Dockerfile +++ b/gateway/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9-minimal:9.4-1134 +FROM registry.access.redhat.com/ubi9-minimal:9.4-1194 RUN microdnf install -y python3.11-3.11.7 python3.11-pip-22.3.1 python3.11-devel-3.11.7 vim-enhanced-8.2.2637 &&\ microdnf clean all RUN ln -s /usr/bin/python3.11 /usr/local/bin/python3 && \ From 538007e914f2e4460635ada5265025459f1ef5ed Mon Sep 17 00:00:00 2001 From: "Paul S. Schweigert" Date: Fri, 26 Jul 2024 12:17:45 -0400 Subject: [PATCH 2/2] use minor version tag Signed-off-by: Paul S. Schweigert --- Dockerfile-ray-node | 2 +- gateway/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile-ray-node b/Dockerfile-ray-node index ce5e14beb..6867d7dcc 100644 --- a/Dockerfile-ray-node +++ b/Dockerfile-ray-node @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9-minimal:9.4-1194 +FROM registry.access.redhat.com/ubi9-minimal:9.4 RUN microdnf install -y python3.11-3.11.7 python3.11-pip-22.3.1 python3.11-devel-3.11.7 vim-enhanced-8.2.2637 wget-1.21.1 &&\ microdnf clean all RUN ln -s /usr/bin/python3.11 /usr/local/bin/python3 && \ diff --git a/gateway/Dockerfile b/gateway/Dockerfile index fdb942504..d64ec4943 100644 --- a/gateway/Dockerfile +++ b/gateway/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9-minimal:9.4-1194 +FROM registry.access.redhat.com/ubi9-minimal:9.4 RUN microdnf install -y python3.11-3.11.7 python3.11-pip-22.3.1 python3.11-devel-3.11.7 vim-enhanced-8.2.2637 &&\ microdnf clean all RUN ln -s /usr/bin/python3.11 /usr/local/bin/python3 && \