From 42043f966c713476fda1b77d6552bf84bd5043fb Mon Sep 17 00:00:00 2001
From: Carl <cboettig@gmail.com>
Date: Thu, 20 Jun 2024 14:56:48 -0700
Subject: [PATCH] images

---
 images/Dockerfile     | 11 ++++++++---
 images/Dockerfile.gpu |  9 ++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/images/Dockerfile b/images/Dockerfile
index bea512d..129908e 100644
--- a/images/Dockerfile
+++ b/images/Dockerfile
@@ -5,16 +5,18 @@ ENV VIRTUAL_ENV /opt/venv
 ENV PATH $VIRTUAL_ENV/bin:$PATH
 
 RUN /rocker_scripts/install_jupyter.sh
+RUN python3 -m pip install numpy
 RUN chown -R ${NB_USER}:staff ${VIRTUAL_ENV} && chmod -R g+rw ${VIRTUAL_ENV}
 
-# install codeserver
-RUN curl -fsSL https://code-server.dev/install.sh | sh && rm -rf .cache
-
 RUN /rocker_scripts/install_geospatial.sh
 
 COPY apt.txt apt.txt
 RUN apt-get update -qq && xargs sudo apt-get -y install < apt.txt
 
+# install codeserver
+RUN curl -fsSL https://code-server.dev/install.sh | sh && rm -rf .cache
+#RUN wget https://github.com/coder/code-server/releases/download/v4.89.1/code-server_4.89.1_amd64.deb && dpkg -i code-server*.deb && rm code-server*.deb
+
 COPY install.R /tmp/install.R
 RUN Rscript /tmp/install.R && rm /tmp/install.R && chown -R ${NB_USER}:staff ${R_HOME}/site-library 
 
@@ -35,4 +37,7 @@ RUN python3 -m pip install --no-cache-dir -r /tmp/spatial-requirements.txt
 COPY rl-requirements.txt /tmp/rl-requirements.txt
 RUN python3 -m pip install --no-cache-dir -r /tmp/rl-requirements.txt
 
+## Register the environment with ipykernel, mostly for vscode to find it
+RUN python3 -m ipykernel install --user --name=venv
+
 
diff --git a/images/Dockerfile.gpu b/images/Dockerfile.gpu
index 874a1a9..5d1104b 100644
--- a/images/Dockerfile.gpu
+++ b/images/Dockerfile.gpu
@@ -29,16 +29,15 @@ WORKDIR /home/${NB_USER}
 RUN usermod -s /bin/bash ${NB_USER}
 COPY spatial-requirements.txt /tmp/spatial-requirements.txt
 RUN python3 -m pip install --no-cache-dir -r /tmp/spatial-requirements.txt
-
-## Register the environment with ipykernel, mostly for vscode to find it
-RUN python3 -m ipykernel install --user --name=venv
-
-
 COPY rl-requirements.txt /tmp/rl-requirements.txt
 RUN python3 -m pip install --no-cache-dir -r /tmp/rl-requirements.txt
 COPY jupyter-requirements.txt /tmp/jupyter-requirements.txt
 RUN python3 -m pip install --no-cache-dir -r /tmp/jupyter-requirements.txt
 
+## Register the environment with ipykernel, mostly for vscode to find it
+RUN python3 -m ipykernel install --user --name=venv
+
+
 USER root 
 COPY install.R /tmp/install.R
 RUN Rscript /tmp/install.R && rm /tmp/install.R && chown -R ${NB_USER}:staff ${R_HOME}/site-library