Compare commits
No commits in common. "714f6017bb2265f82ed0475c6320fb7664fdc2b7" and "5c3ff4a93897aaffd0b978b7e94d5282726c6c16" have entirely different histories.
714f6017bb
...
5c3ff4a938
@ -16,6 +16,12 @@ echo
|
|||||||
basedir=$HOME/discourse
|
basedir=$HOME/discourse
|
||||||
services="sidekiq discourse"
|
services="sidekiq discourse"
|
||||||
patch=$HOME/latest.patch
|
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]')
|
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
|
cd $basedir
|
||||||
@ -33,14 +39,7 @@ git stash apply
|
|||||||
#[ -e $patch ] && . $patch
|
#[ -e $patch ] && . $patch
|
||||||
#echo "command ended with status $?"
|
#echo "command ended with status $?"
|
||||||
|
|
||||||
# not clear why this is a samplefile
|
#echo ~/.rbenv/versions/$rubyver
|
||||||
# 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]+')
|
|
||||||
|
|
||||||
[ ! -L $basedir/.ruby-version ] && ln -sv $basedir/.ruby-version.sample $basedir/.ruby-version
|
|
||||||
|
|
||||||
if [[ ! -e ~/.rbenv/versions/$rubyver ]]
|
if [[ ! -e ~/.rbenv/versions/$rubyver ]]
|
||||||
then
|
then
|
||||||
|
Loading…
Reference in New Issue
Block a user