diff --git a/.github/workflows/docker-gpu-image.yml b/.github/workflows/docker-gpu-image.yml index b955794..be49579 100644 --- a/.github/workflows/docker-gpu-image.yml +++ b/.github/workflows/docker-gpu-image.yml @@ -1,9 +1,9 @@ -name: GPU Image +name: CUDA Image on: workflow_dispatch: null push: paths: - - Dockerfile.cuda + - Dockerfile - environment.yml - install.r jobs: diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index f37ec68..dcb86d3 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,12 +1,10 @@ -name: GPU Image +name: ML Image on: workflow_dispatch: null push: paths: - Dockerfile - - rl-env.yml - - spatial-env.yml - - jupyter-ai.yml + - environment.yml - install.r jobs: build: diff --git a/Dockerfile b/Dockerfile index d65a33c..2fd4b59 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,9 +22,6 @@ RUN curl -s https://raw.githubusercontent.com/rocker-org/ml/refs/heads/master/in ## Add rstudio's binaries to path for quarto ENV PATH=$PATH:/usr/lib/rstudio-server/bin/quarto/bin -## switch non-root users from BSPM to r-universe if no sudo -COPY Rprofile /usr/lib/R/etc/Rprofile.site - # When run as root, install.r automagically handles any necessary apt-gets COPY install.r install.r RUN Rscript install.r diff --git a/Dockerfile.cuda b/Dockerfile.cuda deleted file mode 100644 index d60e98e..0000000 --- a/Dockerfile.cuda +++ /dev/null @@ -1,35 +0,0 @@ -ARG BASE=quay.io/jupyter/pytorch-notebook:cuda12-ubuntu-24.04 -FROM $BASE - -# Make code-server extensions etc persist to container, not hub -ENV XDG_DATA_HOME=/opt/share - -USER root -# code-server (VSCode) -RUN curl -fsSL https://code-server.dev/install.sh | sh && rm -rf .cache - -# apt utilities, code-server setup -RUN curl -s https://raw.githubusercontent.com/rocker-org/ml/refs/heads/main/install_utilities.sh | bash - -RUN curl -s https://raw.githubusercontent.com/rocker-org/ml/refs/heads/main/install_r.sh | bash -RUN curl -s https://raw.githubusercontent.com/rocker-org/ml/refs/heads/main/install_rstudio.sh | bash - -## Add rstudio's binaries to path for quarto -ENV PATH=$PATH:/usr/lib/rstudio-server/bin/quarto/bin - -## switch non-root users from BSPM to r-universe if no sudo -COPY Rprofile /usr/lib/R/etc/Rprofile.site - -# When run as root, install.r automagically handles any necessary apt-gets -COPY install.r install.r -RUN Rscript install.r - -USER ${NB_USER} - -COPY vscode-extensions.txt vscode-extensions.txt -RUN xargs -n 1 code-server --install-extension < vscode-extensions.txt - -COPY environment.yml environment.yml -RUN conda update --all --solver=classic -n base -c conda-forge conda && \ - conda env update --file environment.yml - diff --git a/install_r.sh b/install_r.sh index 5bf7e54..1e1ce38 100644 --- a/install_r.sh +++ b/install_r.sh @@ -48,4 +48,6 @@ ln -s /usr/lib/R/site-library/littler/examples/install2.r /usr/local/bin/install # usermod -a -G staff ${NB_USER} # echo "${NB_USER} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers - +## switch non-root users from BSPM to r-universe if no sudo +wget https://raw.githubusercontent.com/rocker-org/ml/refs/heads/master/Rprofile +mv Rprofile ${R_HOME}/etc/Rprofile.site