From 30978d8c65f1425b59b841b4793938aa90a166de Mon Sep 17 00:00:00 2001 From: hvalev Date: Sat, 12 Oct 2024 17:15:01 +0200 Subject: [PATCH] fix for CentOS EoL --- Dockerfile | 9 --------- README.md | 2 +- determine_arch.sh | 8 -------- 3 files changed, 1 insertion(+), 18 deletions(-) delete mode 100755 determine_arch.sh diff --git a/Dockerfile b/Dockerfile index f40b989..5541be7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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/ diff --git a/README.md b/README.md index 07e2d66..aa0a8e3 100755 --- a/README.md +++ b/README.md @@ -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 diff --git a/determine_arch.sh b/determine_arch.sh deleted file mode 100755 index a420614..0000000 --- a/determine_arch.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -ARCH=$(uname -m); -if [[ "$ARCH" = "aarch64" ]] ; then ARCH='arm64' ; fi -if [[ "$ARCH" = "x86_64" ]] ; then ARCH='x64' ; fi -NODE_VERSION=$(cat shiny-server/.nvmrc) -wget "https://nodejs.org/dist/$NODE_VERSION/SHASUMS256.txt"; -SHA=$(grep "linux-$ARCH.tar.xz" SHASUMS256.txt | awk -F ' +' '{print $1}'); -sed -i -e "8s/.*/NODE_SHA256=$SHA/" -e "s/linux-x64.tar.xz/linux-$ARCH.tar.xz/" -e "s/https:\/\/github.com\/jcheng5\/node-centos7\/releases\/download\//https:\/\/nodejs.org\/dist\//" shiny-server/external/node/install-node.sh \ No newline at end of file