diff --git a/.ruby-version b/.ruby-version index 4fd0fe3cd..ec1cf33c3 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.5.1 \ No newline at end of file +2.6.3 diff --git a/Gemfile.lock b/Gemfile.lock index fab069337..565a25f60 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -521,4 +521,4 @@ DEPENDENCIES whenever BUNDLED WITH - 1.16.1 + 2.0.2 diff --git a/INSTALL.debian b/INSTALL.debian index 186140348..71d43ac91 100644 --- a/INSTALL.debian +++ b/INSTALL.debian @@ -2,7 +2,7 @@ # Run: curl -L -s https://raw.githubusercontent.com/r888888888/danbooru/master/INSTALL.debian -o install.sh ; chmod +x install.sh ; ./install.sh -export RUBY_VERSION=2.5.1 +export RUBY_VERSION=2.6.3 export GITHUB_INSTALL_SCRIPTS=https://raw.githubusercontent.com/r888888888/danbooru/master/script/install export VIPS_VERSION=8.7.0 diff --git a/config/deploy.rb b/config/deploy.rb index 794578a47..4ecdfd466 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -3,7 +3,6 @@ set :default_stage, "staging" set :application, "danbooru" set :repo_url, "git://github.com/r888888888/danbooru.git" set :deploy_to, "/var/www/danbooru2" -set :rbenv_ruby, "2.5.1" append :linked_dirs, "log", "tmp/pids", "tmp/cache", "tmp/sockets", "vendor/bundle" set :branch, ENV.fetch("branch", "master") diff --git a/config/deploy/production.rb b/config/deploy/production.rb index ad2d50ccb..006ccbefe 100644 --- a/config/deploy/production.rb +++ b/config/deploy/production.rb @@ -1,6 +1,5 @@ set :user, "danbooru" set :rails_env, "production" -set :rbenv_path, "/home/danbooru/.rbenv" append :linked_files, ".env.production" server "kagamihara", :roles => %w(web app), :primary => true diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb index b6a56be37..87527985c 100644 --- a/config/deploy/staging.rb +++ b/config/deploy/staging.rb @@ -3,5 +3,4 @@ set :rails_env, "staging" server "testbooru.donmai.us", :roles => %w(web app db), :primary => true, :user => "danbooru" set :linked_files, fetch(:linked_files, []).push(".env.staging") -set :rbenv_path, "/home/danbooru/.rbenv" set :deploy_to, "/var/www/danbooru2" diff --git a/config/docker/danbooru-base b/config/docker/danbooru-base index bab4b0794..44e79230e 100644 --- a/config/docker/danbooru-base +++ b/config/docker/danbooru-base @@ -1,4 +1,4 @@ -FROM ruby:2.5.1-slim-stretch +FROM ruby:2.6.3-slim-stretch ENV DOCKERIZE_VERSION v0.6.1 ENV VIPS_VERSION 8.7.0 diff --git a/script/install/app_server.sh b/script/install/app_server.sh index 5b5803593..bb408dd59 100644 --- a/script/install/app_server.sh +++ b/script/install/app_server.sh @@ -5,7 +5,7 @@ # # Run: curl -L -s https://raw.githubusercontent.com/r888888888/danbooru/master/script/install/app_server.sh | sh -export RUBY_VERSION=2.5.1 +export RUBY_VERSION=2.6.3 export GITHUB_INSTALL_SCRIPTS=https://raw.githubusercontent.com/r888888888/danbooru/master/script/install export VIPS_VERSION=8.7.0