Merge pull request #120 from hvalev/Shiny-updates

Update Shiny Server to 1.5.23.1030

Dockerfile

@@ -4,7 +4,7 @@
 FROM debian:bookworm-20240926 AS builder
 
 ENV V_RStudio=R-4.4.1
-ENV V_ShinyServer=v1.5.22.1017
+ENV V_ShinyServer=v1.5.23.1030
 
 RUN apt-get update && apt-get install -y \
     gfortran \
@@ -48,21 +48,12 @@ RUN wget https://cran.rstudio.com/src/base/R-4/${V_RStudio}.tar.gz && \
     cd /usr/local/src/ && \
     rm -rf ${V_RStudio}*
 
-# #Set python3 as the default python
-# RUN rm /usr/bin/python && \
-#     ln -s /usr/bin/python3 /usr/bin/python
-
 #Install shiny-server with fix for arm architectures
 WORKDIR /
 RUN git clone --depth 1 --branch ${V_ShinyServer} https://github.com/rstudio/shiny-server.git && \
     mkdir shiny-server/tmp
 COPY binding.gyp /shiny-server/tmp/binding.gyp
 
-#Automagically determine arch and replace it in hash values and links
-COPY determine_arch.sh /determine_arch.sh
-RUN chmod +x determine_arch.sh && \
-    ./determine_arch.sh
-
 ARG PYTHON=`which python3`
 
 WORKDIR /shiny-server/tmp/
@@ -89,7 +80,7 @@ RUN make -j4 install
 ###########################
 # Production image
 ###########################
-FROM debian:bookworm-20240926 as shiny
+FROM debian:bookworm-20240926 AS shiny
 COPY --from=builder /usr/local/bin/R /usr/local/bin/R
 COPY --from=builder /usr/local/lib/R /usr/local/lib/R
 COPY --from=builder /usr/local/bin/Rscript /usr/local/bin/Rscript

README.md

@@ -1,7 +1,7 @@
 # Shiny Server on Docker for x86 and ARM
 [![build](https://github.com/hvalev/shiny-server-arm-docker/actions/workflows/build.yml/badge.svg)](https://github.com/hvalev/shiny-server-arm-docker/actions/workflows/build.yml)
 ![R%20version](https://img.shields.io/badge/R%20version-4.4.1-green)
-![Shiny%20version](https://img.shields.io/badge/Shiny%20version-1.5.22.1017-green)
+![Shiny%20version](https://img.shields.io/badge/Shiny%20version-1.5.23.1030-green)
 ![Docker Pulls](https://img.shields.io/docker/pulls/hvalev/shiny-server-arm)
 ![Docker Image Size (latest by date)](https://img.shields.io/docker/image-size/hvalev/shiny-server-arm)
 
@@ -84,7 +84,7 @@ Although you can install R libraries post-install, you could also bake those in
 ```RUN R -e "install.packages(c('shiny', 'Cairo'), repos='http://cran.rstudio.com/')"```.
 Cairo is needed for the hello-world preloaded app. If it's missing the histogram won't be loaded.
 
-### Node.js
+### Node.js (DEPRECATED since R4.4.1-S1.5.23.1030)
 I have written the [determine_arch.sh](https://github.com/hvalev/shiny-server-arm-docker/blob/master/determine_arch.sh) script, which automagically determines the architecture it's running on, fetches the appropriate node.js checksum and replaces it in the install-node.sh file. It should be future-proof as the reference node.js version is taken from the cloned shiny-server repository itself.
 
 ## Acknowledgements

Shiny-version.txt

@@ -1 +1 @@
-1.5.22.1017
+1.5.23.1030