Skip to content

Commit 3b842da

Browse files
committed
Run ci/generate_code.sh to apply fixes
1 parent 50fb52c commit 3b842da

File tree

30 files changed

+565
-7
lines changed

30 files changed

+565
-7
lines changed

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

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,4 +144,19 @@ LABEL name="rhoai/odh-workbench-codeserver-datascience-cpu-py311-rhel9" \
144144
summary="code-server image with python 3.11 based on UBI 9" \
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" \
147-
com.redhat.license_terms="https://www.redhat.com/licenses/Red_Hat_Standard_EULA_20191108.pdf"
147+
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: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,3 +145,19 @@ 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/datascience/ubi9-python-3.11/Dockerfile.konflux.cpu

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,4 +123,24 @@ LABEL name="rhoai/odh-workbench-jupyter-datascience-cpu-py311-rhel9" \
123123
summary="Jupyter data science notebook image for ODH notebooks" \
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" \
126-
com.redhat.license_terms="https://www.redhat.com/licenses/Red_Hat_Standard_EULA_20191108.pdf"
126+
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: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,4 +121,24 @@ LABEL name="rhoai/odh-workbench-jupyter-datascience-cpu-py312-rhel9" \
121121
summary="Jupyter data science notebook image for ODH notebooks" \
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" \
124-
com.redhat.license_terms="https://www.redhat.com/licenses/Red_Hat_Standard_EULA_20191108.pdf"
124+
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: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,24 @@ 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: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,3 +200,24 @@ LABEL name="rhoai/odh-workbench-jupyter-minimal-cuda-py311-rhel9" \
200200
description="Minimal Jupyter CUDA notebook image with base Python 3.11 builder image based on UBI9 for ODH notebooks" \
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"
203+
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: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,3 +106,24 @@ 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: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,24 @@ 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: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,3 +182,24 @@ 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: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,3 +104,24 @@ 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

0 commit comments

Comments
 (0)