Skip to content

Commit c8e3b28

Browse files
wznoinskwznoinsk
authored
Merge pull request #1476 from red-hat-data-services/wznoinsk_main_cleanup_dockerfile.konflux
remove extra not-needed dnf/curl commands from Dockerfile.konflux*
2 parents 2ba0424 + 6b5a294 commit c8e3b28

File tree

19 files changed

+4
-351
lines changed

19 files changed

+4
-351
lines changed

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -124,23 +124,3 @@ LABEL name="rhoai/odh-workbench-jupyter-datascience-cpu-py311-rhel9" \
124124
description="Jupyter data science notebook image with base Python 3.11 builder image based on UBI9 for ODH notebooks" \
125125
io.k8s.description="Jupyter data science notebook image with base Python 3.11 builder image based on UBI9 for ODH notebooks" \
126126
com.redhat.license_terms="https://www.redhat.com/licenses/Red_Hat_Standard_EULA_20191108.pdf"
127-
# upgrade first to avoid fixable vulnerabilities begin
128-
RUN dnf -y upgrade --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0 \
129-
&& dnf clean all -y
130-
# upgrade first to avoid fixable vulnerabilities end
131-
132-
# Install micropipenv and uv to deploy packages from requirements.txt begin
133-
RUN pip install --no-cache-dir -U "micropipenv[toml]" "uv"
134-
# Install micropipenv and uv to deploy packages from requirements.txt end
135-
136-
# Install the oc client begin
137-
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/ocp/stable/openshift-client-linux.tar.gz \
138-
-o /tmp/openshift-client-linux.tar.gz && \
139-
tar -xzvf /tmp/openshift-client-linux.tar.gz oc && \
140-
rm -f /tmp/openshift-client-linux.tar.gz
141-
# Install the oc client end
142-
143-
# Dependencies for PDF export begin
144-
RUN ./utils/install_pdf_deps.sh
145-
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
146-
# Dependencies for PDF export end

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -122,23 +122,3 @@ LABEL name="rhoai/odh-workbench-jupyter-datascience-cpu-py312-rhel9" \
122122
description="Jupyter data science notebook image with base Python 3.12 builder image based on UBI9 for ODH notebooks" \
123123
io.k8s.description="Jupyter data science notebook image with base Python 3.12 builder image based on UBI9 for ODH notebooks" \
124124
com.redhat.license_terms="https://www.redhat.com/licenses/Red_Hat_Standard_EULA_20191108.pdf"
125-
# upgrade first to avoid fixable vulnerabilities begin
126-
RUN dnf -y upgrade --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0 \
127-
&& dnf clean all -y
128-
# upgrade first to avoid fixable vulnerabilities end
129-
130-
# Install micropipenv and uv to deploy packages from requirements.txt begin
131-
RUN pip install --no-cache-dir -U "micropipenv[toml]" "uv"
132-
# Install micropipenv and uv to deploy packages from requirements.txt end
133-
134-
# Install the oc client begin
135-
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/ocp/stable/openshift-client-linux.tar.gz \
136-
-o /tmp/openshift-client-linux.tar.gz && \
137-
tar -xzvf /tmp/openshift-client-linux.tar.gz oc && \
138-
rm -f /tmp/openshift-client-linux.tar.gz
139-
# Install the oc client end
140-
141-
# Dependencies for PDF export begin
142-
RUN ./utils/install_pdf_deps.sh
143-
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
144-
# Dependencies for PDF export end

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -72,24 +72,3 @@ LABEL name="rhoai/odh-workbench-jupyter-minimal-cpu-py311-rhel9" \
7272
description="Minimal Jupyter notebook image with base Python 3.11 builder image based on UBI9 for ODH notebooks" \
7373
io.k8s.description="Minimal Jupyter notebook image with base Python 3.11 builder image based on UBI9 for ODH notebooks" \
7474
com.redhat.license_terms="https://www.redhat.com/licenses/Red_Hat_Standard_EULA_20191108.pdf"
75-
76-
# upgrade first to avoid fixable vulnerabilities begin
77-
RUN dnf -y upgrade --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0 \
78-
&& dnf clean all -y
79-
# upgrade first to avoid fixable vulnerabilities end
80-
81-
# Install micropipenv and uv to deploy packages from requirements.txt begin
82-
RUN pip install --no-cache-dir -U "micropipenv[toml]" "uv"
83-
# Install micropipenv and uv to deploy packages from requirements.txt end
84-
85-
# Install the oc client begin
86-
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/ocp/stable/openshift-client-linux.tar.gz \
87-
-o /tmp/openshift-client-linux.tar.gz && \
88-
tar -xzvf /tmp/openshift-client-linux.tar.gz oc && \
89-
rm -f /tmp/openshift-client-linux.tar.gz
90-
# Install the oc client end
91-
92-
# Dependencies for PDF export begin
93-
RUN ./utils/install_pdf_deps.sh
94-
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
95-
# Dependencies for PDF export end

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -201,23 +201,3 @@ LABEL name="rhoai/odh-workbench-jupyter-minimal-cuda-py311-rhel9" \
201201
io.k8s.description="Minimal Jupyter CUDA notebook image with base Python 3.11 builder image based on UBI9 for ODH notebooks" \
202202
com.redhat.license_terms="https://www.redhat.com/licenses/Red_Hat_Standard_EULA_20191108.pdf"
203203

204-
# upgrade first to avoid fixable vulnerabilities begin
205-
RUN dnf -y upgrade --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0 \
206-
&& dnf clean all -y
207-
# upgrade first to avoid fixable vulnerabilities end
208-
209-
# Install micropipenv and uv to deploy packages from requirements.txt begin
210-
RUN pip install --no-cache-dir -U "micropipenv[toml]" "uv"
211-
# Install micropipenv and uv to deploy packages from requirements.txt end
212-
213-
# Install the oc client begin
214-
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/ocp/stable/openshift-client-linux.tar.gz \
215-
-o /tmp/openshift-client-linux.tar.gz && \
216-
tar -xzvf /tmp/openshift-client-linux.tar.gz oc && \
217-
rm -f /tmp/openshift-client-linux.tar.gz
218-
# Install the oc client end
219-
220-
# Dependencies for PDF export begin
221-
RUN ./utils/install_pdf_deps.sh
222-
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
223-
# Dependencies for PDF export end

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -106,24 +106,3 @@ LABEL name="rhoai/odh-workbench-jupyter-minimal-rocm-py311-rhel9" \
106106
description="Minimal Jupyter ROCm notebook image with base Python 3.11 builder image based on UBI9 for ODH notebooks" \
107107
io.k8s.description="Minimal Jupyter ROCm notebook image with base Python 3.11 builder image based on UBI9 for ODH notebooks" \
108108
com.redhat.license_terms="https://www.redhat.com/licenses/Red_Hat_Standard_EULA_20191108.pdf"
109-
110-
# upgrade first to avoid fixable vulnerabilities begin
111-
RUN dnf -y upgrade --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0 \
112-
&& dnf clean all -y
113-
# upgrade first to avoid fixable vulnerabilities end
114-
115-
# Install micropipenv and uv to deploy packages from requirements.txt begin
116-
RUN pip install --no-cache-dir -U "micropipenv[toml]" "uv"
117-
# Install micropipenv and uv to deploy packages from requirements.txt end
118-
119-
# Install the oc client begin
120-
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/ocp/stable/openshift-client-linux.tar.gz \
121-
-o /tmp/openshift-client-linux.tar.gz && \
122-
tar -xzvf /tmp/openshift-client-linux.tar.gz oc && \
123-
rm -f /tmp/openshift-client-linux.tar.gz
124-
# Install the oc client end
125-
126-
# Dependencies for PDF export begin
127-
RUN ./utils/install_pdf_deps.sh
128-
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
129-
# Dependencies for PDF export end

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -80,24 +80,3 @@ LABEL name="rhoai/odh-workbench-jupyter-minimal-cpu-py312-rhel9" \
8080
description="Minimal Jupyter notebook image with base Python 3.12 builder image based on UBI9 for ODH notebooks" \
8181
io.k8s.description="Minimal Jupyter notebook image with base Python 3.12 builder image based on UBI9 for ODH notebooks" \
8282
com.redhat.license_terms="https://www.redhat.com/licenses/Red_Hat_Standard_EULA_20191108.pdf"
83-
84-
# upgrade first to avoid fixable vulnerabilities begin
85-
RUN dnf -y upgrade --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0 \
86-
&& dnf clean all -y
87-
# upgrade first to avoid fixable vulnerabilities end
88-
89-
# Install micropipenv and uv to deploy packages from requirements.txt begin
90-
RUN pip install --no-cache-dir -U "micropipenv[toml]" "uv"
91-
# Install micropipenv and uv to deploy packages from requirements.txt end
92-
93-
# Install the oc client begin
94-
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/ocp/stable/openshift-client-linux.tar.gz \
95-
-o /tmp/openshift-client-linux.tar.gz && \
96-
tar -xzvf /tmp/openshift-client-linux.tar.gz oc && \
97-
rm -f /tmp/openshift-client-linux.tar.gz
98-
# Install the oc client end
99-
100-
# Dependencies for PDF export begin
101-
RUN ./utils/install_pdf_deps.sh
102-
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
103-
# Dependencies for PDF export end

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

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

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -104,24 +104,3 @@ LABEL name="rhoai/odh-workbench-jupyter-minimal-rocm-py312-rhel9" \
104104
description="Minimal Jupyter ROCm notebook image with base Python 3.12 builder image based on UBI9 for ODH notebooks" \
105105
io.k8s.description="Minimal Jupyter ROCm notebook image with base Python 3.12 builder image based on UBI9 for ODH notebooks" \
106106
com.redhat.license_terms="https://www.redhat.com/licenses/Red_Hat_Standard_EULA_20191108.pdf"
107-
108-
# upgrade first to avoid fixable vulnerabilities begin
109-
RUN dnf -y upgrade --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0 \
110-
&& dnf clean all -y
111-
# upgrade first to avoid fixable vulnerabilities end
112-
113-
# Install micropipenv and uv to deploy packages from requirements.txt begin
114-
RUN pip install --no-cache-dir -U "micropipenv[toml]" "uv"
115-
# Install micropipenv and uv to deploy packages from requirements.txt end
116-
117-
# Install the oc client begin
118-
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/ocp/stable/openshift-client-linux.tar.gz \
119-
-o /tmp/openshift-client-linux.tar.gz && \
120-
tar -xzvf /tmp/openshift-client-linux.tar.gz oc && \
121-
rm -f /tmp/openshift-client-linux.tar.gz
122-
# Install the oc client end
123-
124-
# Dependencies for PDF export begin
125-
RUN ./utils/install_pdf_deps.sh
126-
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
127-
# Dependencies for PDF export end

‎jupyter/pytorch/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-pytorch-cuda-py311-rhel9" \
264264
description="Jupyter CUDA pytorch notebook image with base Python 3.11 builder image based on UBI9 for ODH notebooks" \
265265
io.k8s.description="Jupyter CUDA pytorch 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/pytorch/ubi9-python-3.12/Dockerfile.konflux.cuda

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

0 commit comments

Comments
 (0)