From 09c076c70a9a6f0b69b3a2a0fae49f709de9909f Mon Sep 17 00:00:00 2001 From: vnijs Date: Tue, 3 Oct 2023 16:53:27 -0700 Subject: [PATCH] add .lintr --- files/setup.sh | 12 ++++++++++ scripts/build-images.sh | 51 +++++++---------------------------------- 2 files changed, 20 insertions(+), 43 deletions(-) diff --git a/files/setup.sh b/files/setup.sh index 492c4da..e78f7be 100644 --- a/files/setup.sh +++ b/files/setup.sh @@ -157,6 +157,18 @@ else fi fi +if [ ! -f "${HOMEDIR}/.lintr" ]; then + echo "---------------------------------------------------" + echo "Adding a .lintr file to set linting preferences for" + echo "R in VS Code" + echo "---------------------------------------------------" + echo 'linters: linters_with_defaults( + object_name_linter = NULL, + commented_code_linter = NULL, + line_length_linter(120)) +' > "${HOMEDIR}/.lintr" +fi + if [ ! -d "${HOMEDIR}/.rsm-msba/TinyTex" ]; then echo "---------------------------------------------------" echo "To create PDFs you will need to install a recent" diff --git a/scripts/build-images.sh b/scripts/build-images.sh index d612f1b..10fec8a 100755 --- a/scripts/build-images.sh +++ b/scripts/build-images.sh @@ -3,33 +3,8 @@ # git pull docker login -## moving to msba-arm and msba-intel tags -# docker pull vnijs/rsm-msba-arm:2.8.0 -# docker tag vnijs/rsm-msba-arm:2.8.0 vnijs/rsm-msba-arm:2.8.0 -# docker push vnijs/rsm-msba-arm:2.8.0 - -# docker tag vnijs/rsm-msba-arm:2.8.0 vnijs/rsm-msba-arm:latest -# docker push vnijs/rsm-msba-arm:latest - -# docker pull vnijs/rsm-msba-intel:2.8.0 -# docker tag vnijs/rsm-msba-intel:2.8.0 vnijs/rsm-msba-intel:2.8.0 -# docker push vnijs/rsm-msba-intel:2.8.0 - -# docker pull vnijs/rsm-msba-intel:2.8.0 -# docker tag vnijs/rsm-msba-intel:2.8.0 vnijs/rsm-msba-intel:latest -# docker push vnijs/rsm-msba-intel:latest - -# docker pull vnijs/rsm-jupyterhub:2.8.0 -# docker tag vnijs/rsm-jupyterhub:2.8.0 vnijs/rsm-msba-intel-jupyterhub:2.8.0 -# docker tag vnijs/rsm-msba-intel-jupyterhub:2.8.0 vnijs/rsm-msba-intel-jupyterhub:latest -# docker push vnijs/rsm-msba-intel-jupyterhub:2.8.0 -# docker push vnijs/rsm-msba-intel-jupyterhub:latest - - - - # mkdir -vp ~/.docker/cli-plugins/ -# # curl --silent -L "https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.linux-amd64" > ~/.docker/cli-plugins/docker-buildx +# curl --silent -L "https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.linux-amd64" > ~/.docker/cli-plugins/docker-buildx # curl --silent -L "https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.linux-arm64" > ~/.docker/cli-plugins/docker-buildx # chmod a+x ~/.docker/cli-plugins/docker-buildx @@ -112,27 +87,17 @@ launcher () { fi } -# LABEL=rsm-ssh -# build - -# exit 0 - -# LABEL=rsm-code-interpreter -# build - -# exit 0 - if [ "$(uname -m)" = "arm64" ]; then LABEL=rsm-msba-arm build else - LABEL=rsm-msba-intel - build + # LABEL=rsm-msba-intel + # build - ## replace 127.0.0.1 by 0.0.0.0 for ChromeOS - cp -p ./launch-rsm-msba-intel.sh ./launch-rsm-msba-intel-chromeos.sh - sed_fun "s/127.0.0.1/0.0.0.0/g" ./launch-rsm-msba-intel-chromeos.sh - sed_fun "s/ostype=\"Linux\"/ostype=\"ChromeOS\"/" ./launch-rsm-msba-intel-chromeos.sh + # ## replace 127.0.0.1 by 0.0.0.0 for ChromeOS + # cp -p ./launch-rsm-msba-intel.sh ./launch-rsm-msba-intel-chromeos.sh + # sed_fun "s/127.0.0.1/0.0.0.0/g" ./launch-rsm-msba-intel-chromeos.sh + # sed_fun "s/ostype=\"Linux\"/ostype=\"ChromeOS\"/" ./launch-rsm-msba-intel-chromeos.sh LABEL=rsm-msba-intel-jupyterhub build @@ -141,7 +106,7 @@ else docker tag vnijs/rsm-msba-intel-jupyterhub:$JHUB_VERSION jupyterhub-user ## new containers should be launched using the newest version of the container - #docker tag vnijs/rsm-msba-intel-jupyterhub:latest jupyterhub-test-user + # docker tag vnijs/rsm-msba-intel-jupyterhub:latest jupyterhub-test-user fi ## to connec on a server use