aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/app-ruby-build.src4
-rw-r--r--scripts/install12
2 files changed, 8 insertions, 8 deletions
diff --git a/conf/app-ruby-build.src b/conf/app-ruby-build.src
index b668784..b42dba6 100644
--- a/conf/app-ruby-build.src
+++ b/conf/app-ruby-build.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/rbenv/ruby-build/archive/v20181225.tar.gz
-SOURCE_SUM=5ace4787ace47384dc419b20f5eb5a59f1174e00bfabcfed74a175033cd0b18a
+SOURCE_URL=https://github.com/rbenv/ruby-build/releases/tag/v20181019
+SOURCE_SUM=042232519a1c4623562fb533fff5e7764d8136c9b70a4e74a924a36d520af7a3
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true
diff --git a/scripts/install b/scripts/install
index 420dac1..3bae370 100644
--- a/scripts/install
+++ b/scripts/install
@@ -161,14 +161,14 @@ eval \"\$(rbenv init -)\"" > $final_path/.profile
# Install ruby-build
(
- exec_as "$app" $final_path/.rbenv/bin/rbenv install 2.6.0 || true
- exec_as "$app" $final_path/.rbenv/bin/rbenv global 2.6.0 || true
- exec_as "$app" $final_path/.rbenv/versions/2.6.0/bin/ruby -v
+ exec_as "$app" $final_path/.rbenv/bin/rbenv install 2.5.3 || true
+ exec_as "$app" $final_path/.rbenv/bin/rbenv global 2.5.3 || true
+ exec_as "$app" $final_path/.rbenv/versions/2.5.3/bin/ruby -v
)
# Create symlink for ruby
rm /usr/bin/ruby || true
-ln -s $final_path/.rbenv/versions/2.6.0/bin/ruby /usr/bin/ruby || true
+ln -s $final_path/.rbenv/versions/2.5.3/bin/ruby /usr/bin/ruby || true
# Yarn install on root
pushd $final_path/live
@@ -211,8 +211,8 @@ chown -R "$app": "$final_path"
(
cd "$final_path/live"
su mastodon <<INSTALL
- $final_path/.rbenv/versions/2.6.0/bin/gem install bundler
- $final_path/.rbenv/versions/2.6.0/bin/gem bundle update --bundler
+ $final_path/.rbenv/versions/2.5.3/bin/gem install bundler
+ $final_path/.rbenv/versions/2.5.3/bin/gem bundle update --bundler
$final_path/live/bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --deployment --without development test
yarn install --production --no-progress --non-interactive --silent
echo "SAFETY_ASSURED=1">> .env.production