Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update RStudio Server Notebook #453

Merged
merged 1 commit into from
Mar 14, 2024
Merged

Update RStudio Server Notebook #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion manifests/base/commit.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ odh-habana-notebook-image-commit-n=e5b5f1f
odh-codeserver-notebook-image-commit-n=47251a7
odh-codeserver-notebook-image-commit-n-1=c21f66d
odh-rstudio-notebook-image-commit-n=47251a7
odh-rstudio-notebook-image-commit-n-1=c21f66d
odh-rstudio-notebook-image-commit-n-1=47251a7
odh-rstudio-gpu-notebook-image-commit-n=47251a7
odh-rstudio-gpu-notebook-image-commit-n-1=c21f66d
14 changes: 14 additions & 0 deletions manifests/base/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,13 @@ vars:
apiVersion: v1
fieldref:
fieldpath: data.odh-rstudio-notebook-n-1
- name: odh-rstudio-notebook-n-2
objref:
kind: ConfigMap
name: notebooks-parameters
apiVersion: v1
fieldref:
fieldpath: data.odh-rstudio-notebook-n-2
- name: odh-rstudio-gpu-notebook-n
objref:
kind: ConfigMap
Expand All @@ -193,6 +200,13 @@ vars:
apiVersion: v1
fieldref:
fieldpath: data.odh-rstudio-gpu-notebook-n-1
- name: odh-rstudio-gpu-notebook-n-2
objref:
kind: ConfigMap
name: notebooks-parameters
apiVersion: v1
fieldref:
fieldpath: data.odh-rstudio-gpu-notebook-n-2
- name: odh-minimal-notebook-image-commit-n
objref:
kind: ConfigMap
Expand Down
4 changes: 2 additions & 2 deletions manifests/base/params.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ odh-habana-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:b0821ae2
odh-codeserver-notebook-n=quay.io/opendatahub/workbench-images@sha256:8110cd945161df22aa4c62cd9fb6e2ba2c84699a0c260e990df74fd4e5dd97de
odh-codeserver-notebook-n-1=quay.io/opendatahub/workbench-images@sha256:c6423559bb7c0299e684e2dcf548d80a3832861fb11bc0a78b4db7449252d44e
odh-rstudio-notebook-n=quay.io/opendatahub/workbench-images@sha256:57d907349cbf1640ad2b6099a2e9fc3ddcf337e401f0e6d2bfd4e8883f4ec6fb
odh-rstudio-notebook-n-1=quay.io/opendatahub/workbench-images@sha256:fd9bfb6401a92101560e4f7ace0f3a2ec9f1c3021e33e3b1ee070c9ed0b01604
odh-rstudio-notebook-n-1=quay.io/opendatahub/workbench-images@sha256:57d907349cbf1640ad2b6099a2e9fc3ddcf337e401f0e6d2bfd4e8883f4ec6fb
odh-rstudio-gpu-notebook-n=quay.io/opendatahub/workbench-images@sha256:975b218f376a0f09ceb7c57f0a6cc15dfd10492f779349a23e5d72b0eeb53ade
odh-rstudio-gpu-notebook-n-1=quay.io/opendatahub/workbench-images@sha256:f6afec8733c1143110d10b1886e27321d73facbef975805f7f36fff7fb697c49
odh-rstudio-gpu-notebook-n-1=quay.io/opendatahub/workbench-images@sha256:975b218f376a0f09ceb7c57f0a6cc15dfd10492f779349a23e5d72b0eeb53ade
10 changes: 5 additions & 5 deletions manifests/base/rstudio-gpu-notebook-imagestream.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,27 +17,27 @@ spec:
tags:
# N Version of the image
- annotations:
opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"R","version":"v4.3"},{"name":"Python","version":"v3.9"}]'
opendatahub.io/notebook-software: '[{"name":"CUDA","version":"12.1"},{"name":"R","version":"v4.3"},{"name":"Python","version":"v3.9"}]'
opendatahub.io/notebook-python-dependencies: '[{"name":"rstudio-server","version":"4.3"}]'
openshift.io/imported-from: quay.io/opendatahub/workbench-images
opendatahub.io/workbench-image-recommended: 'true'
opendatahub.io/notebook-build-commit: $(odh-rstudio-gpu-notebook-image-commit-n)
from:
kind: DockerImage
name: $(odh-rstudio-gpu-notebook-n)
name: "2023.2"
name: "2024.1"
referencePolicy:
type: Source
# N - 1 Version of the image
# N Version of the image
- annotations:
opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"Python","version":"v3.9"}]'
opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"R","version":"v4.3"},{"name":"Python","version":"v3.9"}]'
opendatahub.io/notebook-python-dependencies: '[{"name":"rstudio-server","version":"4.3"}]'
openshift.io/imported-from: quay.io/opendatahub/workbench-images
opendatahub.io/workbench-image-recommended: 'false'
opendatahub.io/notebook-build-commit: $(odh-rstudio-gpu-notebook-image-commit-n-1)
from:
kind: DockerImage
name: $(odh-rstudio-gpu-notebook-n-1)
name: "2023.1"
name: "2023.2"
referencePolicy:
type: Source
8 changes: 4 additions & 4 deletions manifests/base/rstudio-notebook-imagestream.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
lookupPolicy:
local: true
tags:
# N Version of the image
# N Version of the image
- annotations:
opendatahub.io/notebook-software: '[{"name":"R","version":"v4.3"},{"name":"Python","version":"v3.9"}]'
opendatahub.io/notebook-python-dependencies: '[{"name":"rstudio-server","version":"4.3"}]'
Expand All @@ -24,19 +24,19 @@ spec:
from:
kind: DockerImage
name: $(odh-rstudio-notebook-n)
name: "2023.2"
name: "2024.1"
referencePolicy:
type: Source
# N - 1 Version of the image
- annotations:
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]'
opendatahub.io/notebook-software: '[{"name":"R","version":"v4.3"},{"name":"Python","version":"v3.9"}]'
opendatahub.io/notebook-python-dependencies: '[{"name":"rstudio-server","version":"4.3"}]'
openshift.io/imported-from: quay.io/opendatahub/workbench-images
opendatahub.io/workbench-image-recommended: 'false'
opendatahub.io/notebook-build-commit: $(odh-rstudio-notebook-image-commit-n-1)
from:
kind: DockerImage
name: $(odh-rstudio-notebook-n-1)
name: "2023.1"
name: "2023.2"
referencePolicy:
type: Source
12 changes: 6 additions & 6 deletions rstudio/c9s-python-3.9/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ LABEL name="odh-notebook-rstudio-server-c9s-python-3.9" \

USER 0

ENV R_VERSION=4.3.1
ENV R_VERSION=4.3.3

# Install R
RUN yum install -y yum-utils && \
Expand All @@ -37,9 +37,9 @@ ENV R_LIBS_USER /opt/app-root/src/Rpackages/4.3
WORKDIR /tmp/

# Install RStudio
RUN wget --progress=dot:giga https://download2.rstudio.org/server/rhel9/x86_64/rstudio-server-rhel-2023.06.1-524-x86_64.rpm && \
yum install -y rstudio-server-rhel-2023.06.1-524-x86_64.rpm && \
rm rstudio-server-rhel-2023.06.1-524-x86_64.rpm && \
RUN wget --progress=dot:giga https://download2.rstudio.org/server/rhel9/x86_64/rstudio-server-rhel-2023.12.1-402-x86_64.rpm && \
yum install -y rstudio-server-rhel-2023.12.1-402-x86_64.rpm && \
rm rstudio-server-rhel-2023.12.1-402-x86_64.rpm && \
yum -y clean all --enablerepo='*'

# Specific RStudio config and fixes
Expand All @@ -53,8 +53,8 @@ RUN dnf install -y libsodium-devel.x86_64 libgit2-devel.x86_64 libcurl-devel har
RUN R -e "install.packages('Rcpp')"

# Install NGINX to proxy RStudio and pass probes check
ENV NGINX_VERSION=1.22 \
NGINX_SHORT_VER=122 \
ENV NGINX_VERSION=1.24 \
NGINX_SHORT_VER=124 \
NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
NGINX_CONF_PATH=/etc/nginx/nginx.conf \
NGINX_DEFAULT_CONF_PATH=${APP_ROOT}/etc/nginx.default.d \
Expand Down
Loading