4.0.2

ShichenXie · Nov 10, 2023 · ba5876b · ba5876b
1 parent 94b34fb
commit ba5876b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.5'
 
 services:
   jupyterhub:
-    # build: jupyterhub
+    platform: linux/amd64
     image: shichenxie/dstudio_hub:4.0
     container_name: jupyterhub
     # Permit communication with the host's docker server

diff --git a/jupyterhub/Dockerfile4.0 b/jupyterhub/Dockerfile4.0
@@ -31,5 +31,5 @@ WORKDIR /srv/jupyterhub
 COPY ./jupyterhub_config.py /etc/jupyterhub/jupyterhub_config.py
 CMD ["jupyterhub", "-f", "/etc/jupyterhub/jupyterhub_config.py"]
 
-# docker build --platform linux/amd64 -t shichenxie/dstudio_hub:4.0 -f ./Dockerfile3.1 .
+# docker build --platform linux/amd64 -t shichenxie/dstudio_hub:4.0 -f ./Dockerfile4.0 .
 # docker save shichenxie/dstudio_hub:1.2.2 -o ~/Downloads/dstudio_hub.tar
diff --git a/jupyterlab/.DS_Store b/jupyterlab/.DS_Store
diff --git a/jupyterlab/Dockerfile_labds_jupyter4.0 b/jupyterlab/Dockerfile_labds_jupyter4.0
@@ -1,5 +1,6 @@
-FROM jupyter/datascience-notebook:hub-4.0.0
+FROM jupyter/datascience-notebook:hub-4.0.2
 # docker pull jupyter/datascience-notebook:hub-4.0.0 --platform linux/amd64
+# docker pull jupyter/r-notebook:hub-4.0.0 --platform linux/amd64
 
 # https://hub.docker.com/r/jupyter/datascience-notebook/
 # https://github.com/rocker-org/rocker-versioned2
@@ -17,7 +18,7 @@ ENV CRAN=https://packagemanager.rstudio.com/all/__linux__/focal/latest
 ARG CRAN_URL=https://mirrors.tuna.tsinghua.edu.cn/CRAN/
 
 ENV S6_VERSION=v2.1.0.2
-ENV RSTUDIO_VERSION=2023.06.0+421
+ENV RSTUDIO_VERSION=2023.09.1+494
 ENV DEFAULT_USER=${NB_USER}
 ENV PANDOC_VERSION=default
 ENV PATH=/usr/lib/rstudio-server/bin:$PATH
@@ -37,7 +38,7 @@ RUN /rocker_scripts/install_rstudio.sh && \
 
 # pkgs ------------------
 # python3 -m pip install --upgrade https://github.com/jupyterhub/jupyter-rsession-proxy/tarball/master &&\
-## conda install
+## conda install # 
 # conda install --quiet --yes pip && \    
 RUN conda install --quiet --yes JayDeBeApi openpyxl \ 
         'r-png' 'r-odbc' 'r-RJDBC' 'r-RPostgres' && \
@@ -83,8 +84,9 @@ RUN /rocker_scripts/install_shiny_server.sh && \
 
 RUN python3 -m pip install --no-cache jupyter-shiny-proxy && \
     R --quiet -e "install.packages(c( \
+        'golem', 'shinipsum', 'fakir', 'gemstones', 'attachment', \
         'flexdashboard', 'bs4Dash', 'shinydashboard', 'shinydashboardPlus', \
-        'shinyFeedback', 'shinyWidgets', \
+        'shinyFeedback', 'shinyWidgets', 'kableExtra', 'DT', \
         'bslib', 'sass', 'thematic', 'htmltools', 'jquerylib', 'htmlwidgets', \
         'shinythemes', 'shinycssloaders', 'shinyBS', 'shiny.i18n', 'shinyFiles', 'miniUI', \
          'sparkline', 'incidence', 'EpiEstim'), repos='${CRAN_URL}')"  && \