general cleanup, revert fork

ucsd-ets · Apr 21, 2024 · e4cfdce · e4cfdce
1 parent db18018
commit e4cfdce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 22 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -61,11 +61,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Check Free Space 0
-        run: |
-          echo "Free space:"
-          df -h
-
       - name: Docker/ENV cleanup Cleanup
         run: |
           docker image prune -a -f
@@ -76,11 +71,6 @@ jobs:
           sudo rm -rf "/usr/local/share/boost"
           sudo rm -rf "$AGENT_TOOLSDIRECTORY"
 
-      - name: Check Free Space 1
-        run: |
-          echo "Free space:"
-          df -h
-
       - name: Install pip dependencies
         run: |
           sudo dnf -y install python-pip
@@ -120,11 +110,6 @@ jobs:
         with:
           repository: ${{github.repository}}.wiki
           path: wiki
-
-      - name: Check Free Space 2
-        run: |
-          echo "Free space:"
-          df -h
 
       - name: Build stack
         env:
@@ -137,7 +122,7 @@ jobs:
         run: |
           python3 scripts/main.py
 
-      - name: Check Free Space 3
+      - name: Check Free Space
         run: |
           echo "Free space:"
           df -h

diff --git a/images/rstudio-notebook/Dockerfile b/images/rstudio-notebook/Dockerfile
@@ -23,8 +23,10 @@ RUN ln -s /opt/conda/bin/R /usr/bin/R && \
     chmod -R g=u /var/lib/rstudio-server && \
     service rstudio-server restart
 
-#RUN pip install jupyter-rsession-proxy
-RUN pip install git+https://github.com/ucsd-ets/datahub-jupyter-rsession-proxy.git
+RUN pip install jupyter-rsession-proxy
+# currently we have an issue where the user's default working dir is ALWAYS /home/jovyan.
+# perhaps fix in our fork below? 
+#RUN pip install git+https://github.com/ucsd-ets/datahub-jupyter-rsession-proxy.git
 
 RUN mkdir -p /etc/rstudio && echo 'auth-minimum-user-id=100' >> /etc/rstudio/rserver.conf
 
@@ -38,10 +40,6 @@ ENV PATH="${PATH}:/usr/lib/rstudio-server/bin" \
 
 COPY ./lib /opt/k8s-support/lib
 
-#RUN R -e "install.packages('rjson', repos='http://cran.rstudio.com/')" && \
-#    R -e "install.packages('session', repos='http://cran.rstudio.com/')" && \
-#    R -e "install.packages('rmarkdown', repos='http://cran.rstudio.com/')"
-
 COPY ./test ./integration_tests /home/jovyan/
 
 RUN chmod 777 /var/ -R