Skip to content

Commit c5e0e77

Browse files
grdryngrdryn
authored
fix(Dockerfile.konflux.*): remove more erroneous duplicate steps (#1487)
This is a follow up to PR #1476, to remove more cases of the same problem.
1 parent 6adbb06 commit c5e0e77

File tree

11 files changed

+1
-210
lines changed

11 files changed

+1
-210
lines changed

‎codeserver/ubi9-python-3.11/Dockerfile.konflux.cpu

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -145,18 +145,3 @@ LABEL name="rhoai/odh-workbench-codeserver-datascience-cpu-py311-rhel9" \
145145
description="code-server image with python 3.11 based on UBI9" \
146146
io.k8s.description="code-server image with python 3.11 based on UBI9" \
147147
com.redhat.license_terms="https://www.redhat.com/licenses/Red_Hat_Standard_EULA_20191108.pdf"
148-
# upgrade first to avoid fixable vulnerabilities begin
149-
RUN dnf -y upgrade --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0 \
150-
&& dnf clean all -y
151-
# upgrade first to avoid fixable vulnerabilities end
152-
153-
# Install micropipenv and uv to deploy packages from requirements.txt begin
154-
RUN pip install --no-cache-dir -U "micropipenv[toml]" "uv"
155-
# Install micropipenv and uv to deploy packages from requirements.txt end
156-
157-
# Install the oc client begin
158-
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/ocp/stable/openshift-client-linux.tar.gz \
159-
-o /tmp/openshift-client-linux.tar.gz && \
160-
tar -xzvf /tmp/openshift-client-linux.tar.gz oc && \
161-
rm -f /tmp/openshift-client-linux.tar.gz
162-
# Install the oc client end

‎codeserver/ubi9-python-3.12/Dockerfile.konflux.cpu

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -145,19 +145,3 @@ LABEL name="rhoai/odh-workbench-codeserver-datascience-cpu-py312-rhel9" \
145145
description="code-server image with python 3.12 based on UBI9" \
146146
io.k8s.description="code-server image with python 3.11 based on UBI9" \
147147
com.redhat.license_terms="https://www.redhat.com/licenses/Red_Hat_Standard_EULA_20191108.pdf"
148-
149-
# upgrade first to avoid fixable vulnerabilities begin
150-
RUN dnf -y upgrade --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0 \
151-
&& dnf clean all -y
152-
# upgrade first to avoid fixable vulnerabilities end
153-
154-
# Install micropipenv and uv to deploy packages from requirements.txt begin
155-
RUN pip install --no-cache-dir -U "micropipenv[toml]" "uv"
156-
# Install micropipenv and uv to deploy packages from requirements.txt end
157-
158-
# Install the oc client begin
159-
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/ocp/stable/openshift-client-linux.tar.gz \
160-
-o /tmp/openshift-client-linux.tar.gz && \
161-
tar -xzvf /tmp/openshift-client-linux.tar.gz oc && \
162-
rm -f /tmp/openshift-client-linux.tar.gz
163-
# Install the oc client end

‎jupyter/rocm/pytorch/ubi9-python-3.11/Dockerfile.konflux.rocm

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -173,24 +173,3 @@ LABEL name="rhoai/odh-workbench-jupyter-pytorch-rocm-py311-rhel9" \
173173
description="Jupyter ROCm pytorch notebook image with base Python 3.11 builder image based on UBI9 for ODH notebooks" \
174174
io.k8s.description="Jupyter ROCm pytorch notebook image with base Python 3.11 builder image based on UBI9 for ODH notebooks" \
175175
com.redhat.license_terms="https://www.redhat.com/licenses/Red_Hat_Standard_EULA_20191108.pdf"
176-
177-
# upgrade first to avoid fixable vulnerabilities begin
178-
RUN dnf -y upgrade --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0 \
179-
&& dnf clean all -y
180-
# upgrade first to avoid fixable vulnerabilities end
181-
182-
# Install micropipenv and uv to deploy packages from requirements.txt begin
183-
RUN pip install --no-cache-dir -U "micropipenv[toml]" "uv"
184-
# Install micropipenv and uv to deploy packages from requirements.txt end
185-
186-
# Install the oc client begin
187-
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/ocp/stable/openshift-client-linux.tar.gz \
188-
-o /tmp/openshift-client-linux.tar.gz && \
189-
tar -xzvf /tmp/openshift-client-linux.tar.gz oc && \
190-
rm -f /tmp/openshift-client-linux.tar.gz
191-
# Install the oc client end
192-
193-
# Dependencies for PDF export begin
194-
RUN ./utils/install_pdf_deps.sh
195-
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
196-
# Dependencies for PDF export end

‎jupyter/rocm/pytorch/ubi9-python-3.12/Dockerfile.konflux.rocm

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -173,24 +173,3 @@ LABEL name="rhoai/odh-workbench-jupyter-pytorch-rocm-py312-rhel9" \
173173
description="Jupyter ROCm pytorch notebook image with base Python 3.12 builder image based on UBI9 for ODH notebooks" \
174174
io.k8s.description="Jupyter ROCm pytorch notebook image with base Python 3.12 builder image based on UBI9 for ODH notebooks" \
175175
com.redhat.license_terms="https://www.redhat.com/licenses/Red_Hat_Standard_EULA_20191108.pdf"
176-
177-
# upgrade first to avoid fixable vulnerabilities begin
178-
RUN dnf -y upgrade --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0 \
179-
&& dnf clean all -y
180-
# upgrade first to avoid fixable vulnerabilities end
181-
182-
# Install micropipenv and uv to deploy packages from requirements.txt begin
183-
RUN pip install --no-cache-dir -U "micropipenv[toml]" "uv"
184-
# Install micropipenv and uv to deploy packages from requirements.txt end
185-
186-
# Install the oc client begin
187-
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/ocp/stable/openshift-client-linux.tar.gz \
188-
-o /tmp/openshift-client-linux.tar.gz && \
189-
tar -xzvf /tmp/openshift-client-linux.tar.gz oc && \
190-
rm -f /tmp/openshift-client-linux.tar.gz
191-
# Install the oc client end
192-
193-
# Dependencies for PDF export begin
194-
RUN ./utils/install_pdf_deps.sh
195-
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
196-
# Dependencies for PDF export end

‎jupyter/rocm/tensorflow/ubi9-python-3.11/Dockerfile.konflux.rocm

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -170,24 +170,3 @@ LABEL name="rhoai/odh-workbench-jupyter-tensorflow-rocm-py311-rhel9" \
170170
description="Jupyter AMD tensorflow notebook image with base Python 3.11 builder image based on UBI9 for ODH notebooks" \
171171
io.k8s.description="Jupyter AMD tensorflow notebook image with base Python 3.11 builder image based on UBI9 for ODH notebooks" \
172172
com.redhat.license_terms="https://www.redhat.com/licenses/Red_Hat_Standard_EULA_20191108.pdf"
173-
174-
# upgrade first to avoid fixable vulnerabilities begin
175-
RUN dnf -y upgrade --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0 \
176-
&& dnf clean all -y
177-
# upgrade first to avoid fixable vulnerabilities end
178-
179-
# Install micropipenv and uv to deploy packages from requirements.txt begin
180-
RUN pip install --no-cache-dir -U "micropipenv[toml]" "uv"
181-
# Install micropipenv and uv to deploy packages from requirements.txt end
182-
183-
# Install the oc client begin
184-
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/ocp/stable/openshift-client-linux.tar.gz \
185-
-o /tmp/openshift-client-linux.tar.gz && \
186-
tar -xzvf /tmp/openshift-client-linux.tar.gz oc && \
187-
rm -f /tmp/openshift-client-linux.tar.gz
188-
# Install the oc client end
189-
190-
# Dependencies for PDF export begin
191-
RUN ./utils/install_pdf_deps.sh
192-
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
193-
# Dependencies for PDF export end

‎jupyter/tensorflow/ubi9-python-3.11/Dockerfile.konflux.cuda

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -264,24 +264,3 @@ LABEL name="rhoai/odh-workbench-jupyter-tensorflow-cuda-py311-rhel9" \
264264
description="Jupyter CUDA tensorflow notebook image with base Python 3.11 builder image based on UBI9 for ODH notebooks" \
265265
io.k8s.description="Jupyter CUDA tensorflow notebook image with base Python 3.11 builder image based on UBI9 for ODH notebooks" \
266266
com.redhat.license_terms="https://www.redhat.com/licenses/Red_Hat_Standard_EULA_20191108.pdf"
267-
268-
# upgrade first to avoid fixable vulnerabilities begin
269-
RUN dnf -y upgrade --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0 \
270-
&& dnf clean all -y
271-
# upgrade first to avoid fixable vulnerabilities end
272-
273-
# Install micropipenv and uv to deploy packages from requirements.txt begin
274-
RUN pip install --no-cache-dir -U "micropipenv[toml]" "uv"
275-
# Install micropipenv and uv to deploy packages from requirements.txt end
276-
277-
# Install the oc client begin
278-
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/ocp/stable/openshift-client-linux.tar.gz \
279-
-o /tmp/openshift-client-linux.tar.gz && \
280-
tar -xzvf /tmp/openshift-client-linux.tar.gz oc && \
281-
rm -f /tmp/openshift-client-linux.tar.gz
282-
# Install the oc client end
283-
284-
# Dependencies for PDF export begin
285-
RUN ./utils/install_pdf_deps.sh
286-
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
287-
# Dependencies for PDF export end

‎jupyter/tensorflow/ubi9-python-3.12/Dockerfile.konflux.cuda

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -241,24 +241,3 @@ LABEL name="rhoai/odh-workbench-jupyter-tensorflow-cuda-py312-rhel9" \
241241
description="Jupyter CUDA tensorflow notebook image with base Python 3.12 builder image based on UBI9 for ODH notebooks" \
242242
io.k8s.description="Jupyter CUDA tensorflow notebook image with base Python 3.12 builder image based on UBI9 for ODH notebooks" \
243243
com.redhat.license_terms="https://www.redhat.com/licenses/Red_Hat_Standard_EULA_20191108.pdf"
244-
245-
# upgrade first to avoid fixable vulnerabilities begin
246-
RUN dnf -y upgrade --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0 \
247-
&& dnf clean all -y
248-
# upgrade first to avoid fixable vulnerabilities end
249-
250-
# Install micropipenv and uv to deploy packages from requirements.txt begin
251-
RUN pip install --no-cache-dir -U "micropipenv[toml]" "uv"
252-
# Install micropipenv and uv to deploy packages from requirements.txt end
253-
254-
# Install the oc client begin
255-
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/ocp/stable/openshift-client-linux.tar.gz \
256-
-o /tmp/openshift-client-linux.tar.gz && \
257-
tar -xzvf /tmp/openshift-client-linux.tar.gz oc && \
258-
rm -f /tmp/openshift-client-linux.tar.gz
259-
# Install the oc client end
260-
261-
# Dependencies for PDF export begin
262-
RUN ./utils/install_pdf_deps.sh
263-
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
264-
# Dependencies for PDF export end

‎jupyter/trustyai/ubi9-python-3.11/Dockerfile.konflux.cpu

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -141,24 +141,3 @@ LABEL name="rhoai/odh-workbench-jupyter-trustyai-cpu-py311-rhel9" \
141141
description="Jupyter trustyai notebook image with base Python 3.11 builder image based on UBI9 for ODH notebooks" \
142142
io.k8s.description="Jupyter trustyai notebook image with base Python 3.11 builder image based on UBI9 for ODH notebooks" \
143143
com.redhat.license_terms="https://www.redhat.com/licenses/Red_Hat_Standard_EULA_20191108.pdf"
144-
145-
# upgrade first to avoid fixable vulnerabilities begin
146-
RUN dnf -y upgrade --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0 \
147-
&& dnf clean all -y
148-
# upgrade first to avoid fixable vulnerabilities end
149-
150-
# Install micropipenv and uv to deploy packages from requirements.txt begin
151-
RUN pip install --no-cache-dir -U "micropipenv[toml]" "uv"
152-
# Install micropipenv and uv to deploy packages from requirements.txt end
153-
154-
# Install the oc client begin
155-
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/ocp/stable/openshift-client-linux.tar.gz \
156-
-o /tmp/openshift-client-linux.tar.gz && \
157-
tar -xzvf /tmp/openshift-client-linux.tar.gz oc && \
158-
rm -f /tmp/openshift-client-linux.tar.gz
159-
# Install the oc client end
160-
161-
# Dependencies for PDF export begin
162-
RUN ./utils/install_pdf_deps.sh
163-
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
164-
# Dependencies for PDF export end

‎jupyter/trustyai/ubi9-python-3.12/Dockerfile.konflux.cpu

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -141,24 +141,3 @@ LABEL name="rhoai/odh-workbench-jupyter-trustyai-cpu-py312-rhel9" \
141141
description="Jupyter trustyai notebook image with base Python 3.12 builder image based on UBI9 for ODH notebooks" \
142142
io.k8s.description="Jupyter trustyai notebook image with base Python 3.12 builder image based on UBI9 for ODH notebooks" \
143143
com.redhat.license_terms="https://www.redhat.com/licenses/Red_Hat_Standard_EULA_20191108.pdf"
144-
145-
# upgrade first to avoid fixable vulnerabilities begin
146-
RUN dnf -y upgrade --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0 \
147-
&& dnf clean all -y
148-
# upgrade first to avoid fixable vulnerabilities end
149-
150-
# Install micropipenv and uv to deploy packages from requirements.txt begin
151-
RUN pip install --no-cache-dir -U "micropipenv[toml]" "uv"
152-
# Install micropipenv and uv to deploy packages from requirements.txt end
153-
154-
# Install the oc client begin
155-
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/ocp/stable/openshift-client-linux.tar.gz \
156-
-o /tmp/openshift-client-linux.tar.gz && \
157-
tar -xzvf /tmp/openshift-client-linux.tar.gz oc && \
158-
rm -f /tmp/openshift-client-linux.tar.gz
159-
# Install the oc client end
160-
161-
# Dependencies for PDF export begin
162-
RUN ./utils/install_pdf_deps.sh
163-
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
164-
# Dependencies for PDF export end

‎runtimes/datascience/ubi9-python-3.11/Dockerfile.konflux.cpu

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/oc
2626
#######################
2727
# runtime-datascience #
2828
#######################
29-
FROM base AS runtime-datascience
29+
FROM base AS runtime-datascience
3030

3131
ARG DATASCIENCE_SOURCE_CODE=runtimes/datascience/ubi9-python-3.11
3232

@@ -53,18 +53,3 @@ LABEL name="rhoai/odh-pipeline-runtime-datascience-cpu-py311-rhel9" \
5353
description="Runtime data science notebook image with base Python 3.11 builder image based on UBI9 for ODH notebooks" \
5454
summary="Runtime data science notebook image for ODH notebooks" \
5555
com.redhat.license_terms="https://www.redhat.com/licenses/Red_Hat_Standard_EULA_20191108.pdf"
56-
# upgrade first to avoid fixable vulnerabilities begin
57-
RUN dnf -y upgrade --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0 \
58-
&& dnf clean all -y
59-
# upgrade first to avoid fixable vulnerabilities end
60-
61-
# Install micropipenv and uv to deploy packages from requirements.txt begin
62-
RUN pip install --no-cache-dir -U "micropipenv[toml]" "uv"
63-
# Install micropipenv and uv to deploy packages from requirements.txt end
64-
65-
# Install the oc client begin
66-
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/ocp/stable/openshift-client-linux.tar.gz \
67-
-o /tmp/openshift-client-linux.tar.gz && \
68-
tar -xzvf /tmp/openshift-client-linux.tar.gz oc && \
69-
rm -f /tmp/openshift-client-linux.tar.gz
70-
# Install the oc client end

0 commit comments

Comments
 (0)