Skip to content

Commit dfc2bf7

Browse files
authored
Remove .json files runtimes from DS notebook & removed the COPY instruction of them on the Dockerfile (#943)
* Remove .json files runtimes from DS notebook as well removed the COPY instruction of them on the Dockerfile * Add runtimes imagestreams on the kustomization * update after the rebase * satisfy tekton pipelines
1 parent 37268e8 commit dfc2bf7

19 files changed

+13
-106
lines changed

.tekton/cuda-jupyter-pytorch-ubi9-python-3-11-pull-request.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ metadata:
1414
== "main" && ( "cuda/NGC-DL-CONTAINER-LICENSE".pathChanged() || "cuda/cuda.repo-x86_64".pathChanged()
1515
|| "jupyter/datascience/ubi9-python-3.11/mongodb-org-6.0.repo-x86_64".pathChanged()
1616
|| "jupyter/datascience/ubi9-python-3.11/mssql-2022.repo-x86_64".pathChanged()
17-
|| "jupyter/datascience/ubi9-python-3.11/runtime-images/***".pathChanged() ||
18-
"jupyter/datascience/ubi9-python-3.11/setup-elyra.sh".pathChanged() || "jupyter/datascience/ubi9-python-3.11/utils/***".pathChanged()
17+
|| "jupyter/datascience/ubi9-python-3.11/setup-elyra.sh".pathChanged() || "jupyter/datascience/ubi9-python-3.11/utils/***".pathChanged()
1918
|| "jupyter/minimal/ubi9-python-3.11/start-notebook.sh".pathChanged() || "jupyter/pytorch/ubi9-python-3.11/Pipfile.lock".pathChanged()
2019
|| "jupyter/utils/***".pathChanged() || ".tekton/cuda-jupyter-pytorch-ubi9-python-3-11-pull-request.yaml".pathChanged()
2120
|| "jupyter/pytorch/ubi9-python-3.11/Dockerfile.cuda".pathChanged() ) && has(body.repository)

.tekton/cuda-jupyter-tensorflow-ubi9-python-3-11-pull-request.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ metadata:
1414
== "main" && ( "cuda/NGC-DL-CONTAINER-LICENSE".pathChanged() || "cuda/cuda.repo-x86_64".pathChanged()
1515
|| "jupyter/datascience/ubi9-python-3.11/mongodb-org-6.0.repo-x86_64".pathChanged()
1616
|| "jupyter/datascience/ubi9-python-3.11/mssql-2022.repo-x86_64".pathChanged()
17-
|| "jupyter/datascience/ubi9-python-3.11/runtime-images/***".pathChanged() ||
18-
"jupyter/datascience/ubi9-python-3.11/setup-elyra.sh".pathChanged() || "jupyter/datascience/ubi9-python-3.11/utils/***".pathChanged()
17+
|| "jupyter/datascience/ubi9-python-3.11/setup-elyra.sh".pathChanged() || "jupyter/datascience/ubi9-python-3.11/utils/***".pathChanged()
1918
|| "jupyter/minimal/ubi9-python-3.11/start-notebook.sh".pathChanged() || "jupyter/tensorflow/ubi9-python-3.11/Pipfile.lock".pathChanged()
2019
|| "jupyter/utils/***".pathChanged() || ".tekton/cuda-jupyter-tensorflow-ubi9-python-3-11-pull-request.yaml".pathChanged()
2120
|| "jupyter/tensorflow/ubi9-python-3.11/Dockerfile.cuda".pathChanged() ) &&

.tekton/jupyter-datascience-ubi9-python-3-11-pull-request.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ metadata:
1414
== "main" && ( "jupyter/datascience/ubi9-python-3.11/Pipfile.lock".pathChanged()
1515
|| "jupyter/datascience/ubi9-python-3.11/mongodb-org-6.0.repo-x86_64".pathChanged()
1616
|| "jupyter/datascience/ubi9-python-3.11/mssql-2022.repo-x86_64".pathChanged()
17-
|| "jupyter/datascience/ubi9-python-3.11/runtime-images/***".pathChanged() ||
18-
"jupyter/datascience/ubi9-python-3.11/setup-elyra.sh".pathChanged() || "jupyter/datascience/ubi9-python-3.11/utils/***".pathChanged()
17+
|| "jupyter/datascience/ubi9-python-3.11/setup-elyra.sh".pathChanged() || "jupyter/datascience/ubi9-python-3.11/utils/***".pathChanged()
1918
|| "jupyter/minimal/ubi9-python-3.11/start-notebook.sh".pathChanged() || "jupyter/utils/***".pathChanged()
2019
|| ".tekton/jupyter-datascience-ubi9-python-3-11-pull-request.yaml".pathChanged()
2120
|| "jupyter/datascience/ubi9-python-3.11/Dockerfile.cpu".pathChanged() ) &&

.tekton/jupyter-trustyai-ubi9-python-3-11-pull-request.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ metadata:
1313
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
1414
== "main" && ( "jupyter/datascience/ubi9-python-3.11/mongodb-org-6.0.repo-x86_64".pathChanged()
1515
|| "jupyter/datascience/ubi9-python-3.11/mssql-2022.repo-x86_64".pathChanged()
16-
|| "jupyter/datascience/ubi9-python-3.11/runtime-images/***".pathChanged() ||
17-
"jupyter/datascience/ubi9-python-3.11/setup-elyra.sh".pathChanged() || "jupyter/datascience/ubi9-python-3.11/utils/***".pathChanged()
16+
|| "jupyter/datascience/ubi9-python-3.11/setup-elyra.sh".pathChanged() || "jupyter/datascience/ubi9-python-3.11/utils/***".pathChanged()
1817
|| "jupyter/minimal/ubi9-python-3.11/start-notebook.sh".pathChanged() || "jupyter/trustyai/ubi9-python-3.11/Pipfile.lock".pathChanged()
1918
|| "jupyter/utils/***".pathChanged() || ".tekton/jupyter-trustyai-ubi9-python-3-11-pull-request.yaml".pathChanged()
2019
|| "jupyter/trustyai/ubi9-python-3.11/Dockerfile.cpu".pathChanged() ) && has(body.repository)

.tekton/rocm-jupyter-pytorch-ubi9-python-3-11-pull-request.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ metadata:
1313
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
1414
== "main" && ( "jupyter/datascience/ubi9-python-3.11/mongodb-org-6.0.repo-x86_64".pathChanged()
1515
|| "jupyter/datascience/ubi9-python-3.11/mssql-2022.repo-x86_64".pathChanged()
16-
|| "jupyter/datascience/ubi9-python-3.11/runtime-images/***".pathChanged() ||
17-
"jupyter/datascience/ubi9-python-3.11/setup-elyra.sh".pathChanged() || "jupyter/datascience/ubi9-python-3.11/utils/***".pathChanged()
16+
|| "jupyter/datascience/ubi9-python-3.11/setup-elyra.sh".pathChanged() || "jupyter/datascience/ubi9-python-3.11/utils/***".pathChanged()
1817
|| "jupyter/minimal/ubi9-python-3.11/start-notebook.sh".pathChanged() || "jupyter/rocm/pytorch/ubi9-python-3.11/Pipfile.lock".pathChanged()
1918
|| "jupyter/rocm/pytorch/ubi9-python-3.11/de-vendor-torch.sh".pathChanged()
2019
|| "jupyter/utils/***".pathChanged() || ".tekton/rocm-jupyter-pytorch-ubi9-python-3-11-pull-request.yaml".pathChanged()

.tekton/rocm-jupyter-tensorflow-ubi9-python-3-11-pull-request.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ metadata:
1313
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
1414
== "main" && ( "jupyter/datascience/ubi9-python-3.11/mongodb-org-6.0.repo-x86_64".pathChanged()
1515
|| "jupyter/datascience/ubi9-python-3.11/mssql-2022.repo-x86_64".pathChanged()
16-
|| "jupyter/datascience/ubi9-python-3.11/runtime-images/***".pathChanged() ||
17-
"jupyter/datascience/ubi9-python-3.11/setup-elyra.sh".pathChanged() || "jupyter/datascience/ubi9-python-3.11/utils/***".pathChanged()
16+
|| "jupyter/datascience/ubi9-python-3.11/setup-elyra.sh".pathChanged() || "jupyter/datascience/ubi9-python-3.11/utils/***".pathChanged()
1817
|| "jupyter/minimal/ubi9-python-3.11/start-notebook.sh".pathChanged() || "jupyter/rocm/tensorflow/ubi9-python-3.11/Pipfile.lock".pathChanged()
1918
|| "jupyter/utils/***".pathChanged() || ".tekton/rocm-jupyter-tensorflow-ubi9-python-3-11-pull-request.yaml".pathChanged()
2019
|| "jupyter/rocm/tensorflow/ubi9-python-3.11/Dockerfile.rocm".pathChanged()

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,4 @@ RUN echo "Installing softwares and packages" && \
104104
chmod -R g+w /opt/app-root/lib/python3.11/site-packages && \
105105
fix-permissions /opt/app-root -P
106106

107-
# Copy Elyra runtime-images definitions and set the version
108-
COPY ${DATASCIENCE_SOURCE_CODE}/runtime-images/ /opt/app-root/share/jupyter/metadata/runtime-images/
109-
110107
WORKDIR /opt/app-root/src

jupyter/datascience/ubi9-python-3.11/runtime-images/datascience-ubi9-py311.json

Lines changed: 0 additions & 12 deletions
This file was deleted.

jupyter/datascience/ubi9-python-3.11/runtime-images/pytorch-ubi9-py311.json

Lines changed: 0 additions & 12 deletions
This file was deleted.

jupyter/datascience/ubi9-python-3.11/runtime-images/rocm-pytorch-ubi9-py311.json

Lines changed: 0 additions & 12 deletions
This file was deleted.

jupyter/datascience/ubi9-python-3.11/runtime-images/rocm-tensorflow-ubi9-py311.json

Lines changed: 0 additions & 12 deletions
This file was deleted.

jupyter/datascience/ubi9-python-3.11/runtime-images/tensorflow-ubi9-py311.json

Lines changed: 0 additions & 12 deletions
This file was deleted.

jupyter/datascience/ubi9-python-3.11/runtime-images/ubi9-py311.json

Lines changed: 0 additions & 12 deletions
This file was deleted.

jupyter/pytorch/ubi9-python-3.11/Dockerfile.cuda

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,5 @@ RUN echo "Installing softwares and packages" && \
236236
chmod -R g+w /opt/app-root/lib/python3.11/site-packages && \
237237
fix-permissions /opt/app-root -P
238238

239-
# Copy Elyra runtime-images definitions and set the version
240-
COPY ${DATASCIENCE_SOURCE_CODE}/runtime-images/ /opt/app-root/share/jupyter/metadata/runtime-images/
241-
242239
WORKDIR /opt/app-root/src
243240

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,4 @@ RUN echo "Installing softwares and packages" && \
153153
chmod -R g+w /opt/app-root/lib/python3.11/site-packages && \
154154
fix-permissions /opt/app-root -P
155155

156-
157-
# Copy Elyra runtime-images definitions and set the version
158-
COPY ${DATASCIENCE_SOURCE_CODE}/runtime-images/ /opt/app-root/share/jupyter/metadata/runtime-images/
159-
160-
WORKDIR /opt/app-root/src
156+
WORKDIR /opt/app-root/src

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,4 @@ RUN echo "Installing softwares and packages" && \
150150
chmod -R g+w /opt/app-root/lib/python3.11/site-packages && \
151151
fix-permissions /opt/app-root -P
152152

153-
154-
# Copy Elyra runtime-images definitions and set the version
155-
COPY ${DATASCIENCE_SOURCE_CODE}/runtime-images/ /opt/app-root/share/jupyter/metadata/runtime-images/
156-
157153
WORKDIR /opt/app-root/src

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,4 @@ RUN echo "Installing softwares and packages" && \
236236
chmod -R g+w /opt/app-root/lib/python3.11/site-packages && \
237237
fix-permissions /opt/app-root -P
238238

239-
# Copy Elyra runtime-images definitions and set the version
240-
COPY ${DATASCIENCE_SOURCE_CODE}/runtime-images/ /opt/app-root/share/jupyter/metadata/runtime-images/
241-
242239
WORKDIR /opt/app-root/src

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,3 @@ RUN echo "Installing softwares and packages" && \
122122
# Fix permissions to support pip in Openshift environments \
123123
chmod -R g+w /opt/app-root/lib/python3.11/site-packages && \
124124
fix-permissions /opt/app-root -P
125-
126-
# Copy Elyra runtime-images definitions and set the version
127-
COPY ${DATASCIENCE_SOURCE_CODE}/runtime-images/ /opt/app-root/share/jupyter/metadata/runtime-images/
128-

manifests/base/kustomization.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ resources:
1414
- jupyter-rocm-minimal-notebook-imagestream.yaml
1515
- jupyter-rocm-pytorch-notebook-imagestream.yaml
1616
- jupyter-rocm-tensorflow-notebook-imagestream.yaml
17+
- runtime-datascience-imagestream.yaml
18+
- runtime-minimal-imagestream.yaml
19+
- runtime-pytorch-imagestream.yaml
20+
- runtime-rocm-pytorch-imagestream.yaml
21+
- runtime-rocm-tensorflow-imagestream.yaml
22+
- runtime-tensorflow-imagestream.yaml
1723

1824
commonLabels:
1925
opendatahub.io/component: "true"

0 commit comments

Comments
 (0)