From 5c3ff4a93897aaffd0b978b7e94d5282726c6c16 Mon Sep 17 00:00:00 2001 From: Milan Date: Fri, 3 May 2024 09:15:56 +0200 Subject: [PATCH] discourse update: default to getting ruby version from file again --- updates/discourse.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/updates/discourse.sh b/updates/discourse.sh index bc08335..4cea259 100644 --- a/updates/discourse.sh +++ b/updates/discourse.sh @@ -18,8 +18,10 @@ 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) -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]+') +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