Updated to Ruby 3.4.1 and bitnami docker images

Author: fileformat

.dockerignore

@@ -1,9 +1,9 @@
+Dockerfile
 .dockerignore
 .editorconfig
 .git/
 .github/
 .gitignore
-Dockerfile
 LICENSE.txt
 *.md
 *.sh

Dockerfile

@@ -1,20 +1,15 @@
-FROM ruby:2.7.1
+FROM bitnami/ruby:latest
 
-# throw errors if Gemfile has been modified since Gemfile.lock
-RUN bundle config --global frozen 1
-
-WORKDIR /usr/src/app
-
-COPY Gemfile Gemfile.lock ./
-RUN bundle install
+WORKDIR /app
 
 COPY . .
+RUN bundle install
 
 ARG COMMIT="(not set)"
 ARG LASTMOD="(not set)"
 ENV COMMIT=$COMMIT
 ENV LASTMOD=$LASTMOD
 
 EXPOSE 4567
-CMD ["./regexplanet.rb"]
+CMD ["ruby", "./regexplanet.rb"]
 

Gemfile

@@ -1,5 +1,8 @@
 source "https://rubygems.org"
-ruby '2.7.1'
+ruby '3.4.1'
 gem 'sinatra'
 gem 'sinatra-contrib'
 gem 'sinatra-jsonp'
+
+gem "rackup", "~> 2.2"
+gem "puma", "~> 6.6"

Gemfile.lock

@@ -1,39 +1,56 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    base64 (0.2.0)
+    logger (1.6.5)
     multi_json (1.15.0)
-    mustermann (1.1.1)
+    mustermann (3.0.3)
       ruby2_keywords (~> 0.0.1)
-    rack (2.2.3)
-    rack-protection (2.2.0)
-      rack
+    nio4r (2.7.4)
+    puma (6.6.0)
+      nio4r (~> 2.0)
+    rack (3.1.9)
+    rack-protection (4.1.1)
+      base64 (>= 0.1.0)
+      logger (>= 1.6.0)
+      rack (>= 3.0.0, < 4)
+    rack-session (2.1.0)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
+    rackup (2.2.1)
+      rack (>= 3)
     ruby2_keywords (0.0.5)
-    sinatra (2.2.0)
-      mustermann (~> 1.0)
-      rack (~> 2.2)
-      rack-protection (= 2.2.0)
+    sinatra (4.1.1)
+      logger (>= 1.6.0)
+      mustermann (~> 3.0)
+      rack (>= 3.0.0, < 4)
+      rack-protection (= 4.1.1)
+      rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
-    sinatra-contrib (2.2.0)
-      multi_json
-      mustermann (~> 1.0)
-      rack-protection (= 2.2.0)
-      sinatra (= 2.2.0)
+    sinatra-contrib (4.1.1)
+      multi_json (>= 0.0.2)
+      mustermann (~> 3.0)
+      rack-protection (= 4.1.1)
+      sinatra (= 4.1.1)
       tilt (~> 2.0)
     sinatra-jsonp (0.5.0)
       multi_json (~> 1.8)
       sinatra (>= 1.0)
-    tilt (2.0.10)
+    tilt (2.6.0)
 
 PLATFORMS
   ruby
+  x86_64-darwin-24
 
 DEPENDENCIES
+  puma (~> 6.6)
+  rackup (~> 2.2)
   sinatra
   sinatra-contrib
   sinatra-jsonp
 
 RUBY VERSION
-   ruby 2.7.1p83
+   ruby 3.4.1p0
 
 BUNDLED WITH
-   2.1.4
+   2.6.2

config.ru

@@ -1,7 +1,16 @@
-#!/bin/bash
+#!/usr/bin/env bash
+#
+# run the docker container version locally
+#
+
+set -o errexit
+set -o pipefail
+set -o nounset
 
 
 docker build -t regexplanet-ruby .
+
+
 docker run \
 	--expose 4000 \
 	--env COMMIT=$(git rev-parse --short HEAD)-local \

docker-run.sh

@@ -1,4 +1,4 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/env ruby
 
 require 'cgi'
 require 'sinatra'
@@ -11,6 +11,7 @@
 	mime_type :svg, 'image/svg+xml'
 	set :static_cache_control, [:public, {:max_age => 604800 } ]
 	set :bind, '0.0.0.0'
+	set :host_authorization, { permitted_hosts: [] }
 	#set :protection, :except => [:frame_options ]
 	#disable :protection
 end
@@ -43,6 +44,7 @@ def get_or_post(path, opts={}, &block)
 		:tech => "Ruby #{RUBY_VERSION}",
 		:timestamp => Time.now.utc.iso8601,
 		:version => RUBY_VERSION,
+		:detail => RUBY_DESCRIPTION,
 		"request.host" => request.host,
 		"request.port" => request.port,
 		:RUBY_DESCRIPTION => RUBY_DESCRIPTION,
@@ -275,7 +277,9 @@ def get_or_post(path, opts={}, &block)
 end
 
 get '/' do
-	redirect 'https://www.regexplanet.com/advanced/ruby/index.html'
+	headers \
+		'Content-Type' => 'text/plain'
+	"Running Ruby " + RUBY_VERSION + " on " + RUBY_PLATFORM
 end
 
 helpers do

regexplanet.rb

@@ -1,9 +1,14 @@
-#!/bin/bash
+#!/usr/bin/env bash
+#
+# run locally
+#
 
+set -o errexit
+set -o pipefail
+set -o nounset
 
-docker build -t regexplanet-ruby .
-docker run \
-	-p 4000:4000 --expose 4000 -e PORT='4000' \
-	-e COMMIT=$(git rev-parse --short HEAD) \
-	-e LASTMOD=$(date -u +%Y-%m-%dT%H:%M:%SZ) \
-	regexplanet-ruby
+
+bundle install
+
+export PORT=4000
+./regexplanet.rb