From 03c02860dcab50f28e7a8eeb0efc0dade1943290 Mon Sep 17 00:00:00 2001 From: Nicolas Le Gall Date: Fri, 23 Feb 2024 10:37:40 +0900 Subject: [PATCH] Update docker base image, update gem --- Dockerfile | 2 +- Gemfile.lock | 11 ++++++----- config/initializers/secret_token.rb | 2 +- .../20170608083959_create_authie_sessions.authie.rb | 2 +- docker-start.sh | 1 + 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6ff0385d..0ac9db31 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.1-alpine +FROM ruby:3.2-alpine LABEL org.opencontainers.image.vendor="Synoptik Labs" LABEL org.opencontainers.image.authors="nicolas.legall@synoptik-labs.com" LABEL org.opencontainers.image.title="Staytus" diff --git a/Gemfile.lock b/Gemfile.lock index e769f78c..f176c27d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -201,8 +201,8 @@ GEM nilify_blanks (1.4.0) activerecord (>= 4.0.0) activesupport (>= 4.0.0) - nio4r (2.5.9) - nokogiri (1.15.4-x86_64-linux) + nio4r (2.7.0) + nokogiri (1.15.5-x86_64-linux) racc (~> 1.4) numerizer (0.1.1) phony (2.20.9) @@ -213,9 +213,9 @@ GEM psych (5.1.1.1) stringio public_suffix (5.0.3) - puma (6.4.0) + puma (6.4.2) nio4r (~> 2.0) - racc (1.7.1) + racc (1.7.3) rack (3.0.8) rack-custom-proxies (1.0.3) rack @@ -293,7 +293,7 @@ GEM uglifier (4.2.0) execjs (>= 0.3.0, < 3) unicode_utils (1.4.0) - uri (0.12.2) + uri (0.13.0) webrick (1.8.1) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) @@ -341,3 +341,4 @@ DEPENDENCIES BUNDLED WITH 2.2.5 + \ No newline at end of file diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb index 3ed0db47..c3171b6d 100644 --- a/config/initializers/secret_token.rb +++ b/config/initializers/secret_token.rb @@ -1,7 +1,7 @@ if ENV['SECRET_KEY_BASE'] Rails.application.secrets.secret_key_base = ENV['SECRET_KEY_BASE'] else - unless File.exists?("config/secret_token.yml") + unless File.exist?("config/secret_token.yml") puts ">> Generating new secret token in config/secret_token.yml" File.open("config/secret_token.yml", "w") do |f| f.write SecureRandom.hex(128).to_yaml diff --git a/db/migrate/20170608083959_create_authie_sessions.authie.rb b/db/migrate/20170608083959_create_authie_sessions.authie.rb index 0b4ab282..cc3ba818 100644 --- a/db/migrate/20170608083959_create_authie_sessions.authie.rb +++ b/db/migrate/20170608083959_create_authie_sessions.authie.rb @@ -13,6 +13,6 @@ def change t.string :last_activity_ip, :last_activity_path t.string :user_agent t.timestamps :null => true - #end + end end end diff --git a/docker-start.sh b/docker-start.sh index cc5aa965..c990b823 100755 --- a/docker-start.sh +++ b/docker-start.sh @@ -17,6 +17,7 @@ else # TODO also copy themes back and forth too # If already configured, check if there are any migrations to run + bundle exec rake db:migrate bundle exec rake staytus:build staytus:upgrade fi