From c64e06c5563a3f100c5ba7dc7cc18ba488d8d23f Mon Sep 17 00:00:00 2001
From: Eli Holmes - NOAA <eli.holmes@noaa.gov>
Date: Wed, 13 Nov 2024 09:42:23 -0800
Subject: [PATCH] Update Dockerfile

---
 Dockerfile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5dcf9dc..0d0658f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,13 @@
 FROM pangeo/base-notebook
+# base image sets CONDA_ENV="notebook", NB_USER=jovyan
 
 USER root
 
 # Define environment variables
 # DISPLAY Tell applications where to open desktop apps - this allows notebooks to pop open GUIs
 ENV REPO_DIR="/srv/repo" \
-    CONDA_ENV="notebook" \
     DISPLAY=":1.0" \
-    R_VERSION="4.4.1" \
-    R_DOCKERFILE="verse_${R_VERSION}" \
-    NB_USER="${NB_USER}"
+    R_VERSION="4.4.1"
 
 COPY . ${REPO_DIR}
 RUN chgrp -R staff ${REPO_DIR} && \
@@ -26,6 +24,7 @@ RUN mkdir -p /pyrocket_scripts && \
 RUN usermod -a -G staff "${NB_USER}"
 
 # Install R, RStudio via Rocker scripts
+ENV R_DOCKERFILE="verse_${R_VERSION}"
 RUN PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin && \
   chmod +x ${REPO_DIR}/rocker.sh && \
   ${REPO_DIR}/rocker.sh