Skip to content

Commit 1872a6e

Browse files
committed
Merge branch 'master' of https://github.com/rocker-org/ml
2 parents ec3c17a + d6b3bc9 commit 1872a6e

File tree

6 files changed

+8
-5
lines changed

6 files changed

+8
-5
lines changed

.github/workflows/docker-gpu-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
permissions: write-all
1818
env:
19-
BASE: 'quay.io/jupyter/pytorch-notebook:cuda12-ubuntu-24.04'
19+
BASE: 'quay.io/jupyter/pytorch-notebook:cuda12-python-3.12'
2020
steps:
2121
# For biggish images, github actions runs out of disk space.
2222
# So we cleanup some unwanted things in the disk image, and reclaim that space for our docker use

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG BASE=quay.io/jupyter/minimal-notebook:ubuntu-24.04
1+
ARG BASE=quay.io/jupyter/minimal-notebook:python-3.12
22

33
# cuda image uses:
44
# ARG BASE=quay.io/jupyter/pytorch-notebook:cuda12-ubuntu-24.04

Rprofile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ local({
3232
options(bspm.sudo = TRUE)
3333
options(bspm.version.check=FALSE)
3434
suppressMessages(bspm::enable())
35+
# workaround for install.packages() stdin hang in RStudio session
36+
assignInNamespace("system2nowarn", function(...) suppressWarnings(system2(..., stdin="/dev/null")), "bspm")
3537

3638
}
3739

install.r

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
install.packages(c(
2+
'archive',
23
'languageserver',
34
'httpgd',
45
'quarto',

install_rstudio.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,6 @@ echo "lock-type=advisory" >/etc/rstudio/file-locks
7272
cp /etc/rstudio/rserver.conf /etc/rstudio/disable_auth_rserver.conf
7373
echo "auth-none=1" >>/etc/rstudio/disable_auth_rserver.conf
7474

75-
76-
su ${NB_USER} -c "/opt/conda/bin/conda install -y jupyter-rsession-proxy"
75+
# don't assume conda, let package manager handle this
76+
# su ${NB_USER} -c "/opt/conda/bin/conda install -y jupyter-rsession-proxy"
7777

vscode-extensions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ms-vscode.live-server
44
quarto.quarto
55
posit.shiny
66
reditorsupport.r
7-
continue.continue
87
alefragnani.project-manager
98
saoudrizwan.claude-dev
9+
posit.air-vscode
1010

0 commit comments

Comments
 (0)