From 68a9a7006fd56f7ee1283dcee2649241f02f01b9 Mon Sep 17 00:00:00 2001 From: Sun Seng David TAN Date: Mon, 25 Jan 2021 16:04:19 +0100 Subject: [PATCH] fix(sidecar): Fix ruby plugin setting default settings to be used (#813) Signed-off-by: Sun Seng David TAN --- sidecars/ruby/Dockerfile | 4 ++++ sidecars/ruby/etc/entrypoint.sh | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/sidecars/ruby/Dockerfile b/sidecars/ruby/Dockerfile index 7c4b5ef02d..6b3b41d186 100644 --- a/sidecars/ruby/Dockerfile +++ b/sidecars/ruby/Dockerfile @@ -13,6 +13,10 @@ FROM ruby:2.7.2-buster ENV HOME=/home/theia +RUN apt-get update && \ + apt-get install jq -y && \ + apt-get clean && apt-get -y autoremove && rm -rf /var/lib/apt/lists/* + RUN mkdir /projects ${HOME} && \ # Change permissions to let any arbitrary user for f in "${HOME}" "/etc/passwd" "/projects"; do \ diff --git a/sidecars/ruby/etc/entrypoint.sh b/sidecars/ruby/etc/entrypoint.sh index bd789673b2..11d88df3c8 100755 --- a/sidecars/ruby/etc/entrypoint.sh +++ b/sidecars/ruby/etc/entrypoint.sh @@ -28,4 +28,10 @@ if [ "${USER_ID}" -ne 0 ] && command -v sudo >/dev/null 2>&1 && sudo -n true > / sudo chown "${USER_ID}:${GROUP_ID}" /projects fi +echo 'Setting "solargraph.bundlerPath" to "/usr/local/bin/bundle" and "solargraph.commandPath" to "/usr/local/bundle/bin/solargraph"' +mkdir -p "${CHE_PROJECTS_ROOT}"/.theia ; +[ ! -f "${CHE_PROJECTS_ROOT}/.theia/settings.json" ] && echo "{}" > "${CHE_PROJECTS_ROOT}/.theia/settings.json" +jq '. += {"solargraph.bundlerPath":"/usr/local/bin/bundle"}' "${CHE_PROJECTS_ROOT}/.theia/settings.json" > /tmp/temp.json && mv /tmp/temp.json "${CHE_PROJECTS_ROOT}/.theia/settings.json" +jq '. += {"solargraph.commandPath":"/usr/local/bundle/bin/solargraph"}' "${CHE_PROJECTS_ROOT}/.theia/settings.json" > /tmp/temp.json && mv /tmp/temp.json "${CHE_PROJECTS_ROOT}/.theia/settings.json" + exec "$@"