discourse update: got ruby version too early

This commit is contained in:
Milan 2024-05-03 09:46:17 +02:00
parent 5c3ff4a938
commit 09e533da0a

View File

@ -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