From 09e533da0a572801ec34f47889fa4a66d2dfd6b7 Mon Sep 17 00:00:00 2001 From: Milan Date: Fri, 3 May 2024 09:46:17 +0200 Subject: [PATCH] discourse update: got ruby version too early --- updates/discourse.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/updates/discourse.sh b/updates/discourse.sh index 4cea259..bc0eba5 100644 --- a/updates/discourse.sh +++ b/updates/discourse.sh @@ -16,12 +16,6 @@ echo basedir=$HOME/discourse services="sidekiq discourse" patch=$HOME/latest.patch -# not clear why this is a samplefile -# they seem to do this by hand on the docker repo -rubyver=$(< $basedir/.ruby-version.sample) -# commenting this because we assume that upstream docker -# uses newer ruby because they don't seem to use release -#rubyver=$(curl -s https://raw.githubusercontent.com/discourse/discourse_docker/main/image/base/slim.Dockerfile | grep -oP '(?<=RUBY_VERSION=)[0-9]+\.[0-9]+\.[0-9]+') nodever=$(curl -s https://raw.githubusercontent.com/discourse/discourse_docker/main/image/base/slim.Dockerfile | grep -oP '(?<=nodesource.com/setup_)[0-9]+[0-9]') cd $basedir @@ -39,7 +33,12 @@ git stash apply #[ -e $patch ] && . $patch #echo "command ended with status $?" -#echo ~/.rbenv/versions/$rubyver +# not clear why this is a samplefile +# they seem to do this by hand on the docker repo +rubyver=$(< $basedir/.ruby-version.sample) +# commenting this because we assume that upstream docker +# uses newer ruby because they don't seem to use release +#rubyver=$(curl -s https://raw.githubusercontent.com/discourse/discourse_docker/main/image/base/slim.Dockerfile | grep -oP '(?<=RUBY_VERSION=)[0-9]+\.[0-9]+\.[0-9]+') if [[ ! -e ~/.rbenv/versions/$rubyver ]] then