Updated ruby to 3.2.2

BuffaloWill · May 5, 2023 · 52ed00e · 52ed00e
1 parent 75745d4
commit 52ed00e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 16 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
-FROM ruby:2.7.7-slim
+FROM ruby:3.2.2-slim
 
 RUN apt-get update && \
-    apt-get install -y make git libsqlite3-dev libxslt-dev libxml2-dev zlib1g-dev gcc && \
+    apt-get install -y make git libsqlite3-dev libxslt-dev libxml2-dev zlib1g-dev gcc g++ && \
     apt-get clean
 
 WORKDIR /oxml_xxe

diff --git a/Gemfile b/Gemfile
@@ -1,14 +1,15 @@
 source "https://rubygems.org"
 
-ruby "2.7.7"
+ruby "3.2.2"
 
-gem "slim"
-gem "sinatra"
+gem "slim"  
+gem "sinatra", '>2.0.0'
 gem "haml"
 gem "rubyzip"
 gem "json"
 gem "nokogiri"
 gem "sequel"
 gem "sqlite3"
+gem "thin"
 gem "rack"
-gem "yaml"
+gem "yaml"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,16 +1,16 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    daemons (1.4.1)
+    eventmachine (1.2.7)
     haml (6.1.1)
       temple (>= 0.8.2)
       thor
       tilt
     json (2.6.3)
-    mini_portile2 (2.8.2)
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
-    nokogiri (1.14.3)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.14.3-x86_64-linux)
       racc (~> 1.4)
     racc (1.6.2)
     rack (2.2.7)
@@ -27,14 +27,18 @@ GEM
     slim (5.1.0)
       temple (~> 0.10.0)
       tilt (>= 2.0.6, < 2.2)
-    sqlite3 (1.6.2)
-      mini_portile2 (~> 2.8.0)
+    sqlite3 (1.6.2-x86_64-linux)
     temple (0.10.0)
+    thin (1.8.2)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0, >= 1.0.4)
+      rack (>= 1, < 3)
     thor (1.2.1)
     tilt (2.1.0)
+    yaml (0.2.1)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   haml
@@ -43,12 +47,14 @@ DEPENDENCIES
   rack
   rubyzip
   sequel
-  sinatra
+  sinatra (> 2.0.0)
   slim
   sqlite3
+  thin
+  yaml
 
 RUBY VERSION
-   ruby 2.7.7p221
+   ruby 3.2.2p53
 
 BUNDLED WITH
-   2.1.4
+   2.4.12
diff --git a/server.rb b/server.rb
@@ -167,7 +167,6 @@
 
 get '/list' do
 	@files = Oxfile.all
-  p @files
 
   slim :list
 end