Dockerfile: upgrade base image

cyber-dojo · Sep 15, 2023 · 1f48f0b · 1f48f0b
1 parent 3b302be
commit 1f48f0b
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 13 deletions.
diff --git a/build_test_publish.sh b/build_test_publish.sh
@@ -32,7 +32,6 @@ create_docker_compose_yml
 on_ci_kosli_create_flow
 build_images "$@"
 exit_zero_if_build_only "$@"
-
 server_up_healthy_and_clean "$@"
 client_up_healthy_and_clean "$@"
 copy_in_saver_test_data

diff --git a/sh/containers_up_healthy_and_clean.sh b/sh/containers_up_healthy_and_clean.sh
@@ -90,7 +90,7 @@ clean_top_5()
 {
   # 1st 6 lines on Puma
   local -r L1="Puma starting in single mode..."
-  local -r L2='* Puma version: 6.1.1 (ruby 3.2.1-p31) ("The Way Up")'
+  local -r L2='* Puma version: 6.3.1 (ruby 3.2.2-p53) ("Mugi No Toki Itaru")'
   local -r L3="*  Min threads: 0"
   local -r L4="*  Max threads: 5"
   local -r L5="*  Environment: production"

diff --git a/sources/client/Dockerfile b/sources/client/Dockerfile
@@ -1,4 +1,4 @@
-FROM cyberdojo/sinatra-base:bbb7973
+FROM cyberdojo/sinatra-base:396f3d2
 LABEL maintainer=jon@jaggersoft.com
 
 WORKDIR /app

diff --git a/sources/server/Dockerfile b/sources/server/Dockerfile
@@ -1,4 +1,4 @@
-FROM cyberdojo/sinatra-base:bbb7973
+FROM cyberdojo/sinatra-base:396f3d2
 LABEL maintainer=jon@jaggersoft.com
 
 WORKDIR /app

diff --git a/test/coverage.rb b/test/coverage.rb
@@ -4,11 +4,9 @@
 SimpleCov.start do
   enable_coverage :branch
   filters.clear
-
-  add_filter("/usr/")
-
+  # add_filter("test/id58_test_base.rb")
   coverage_dir(ENV['COVERAGE_ROOT'])
-  #add_group('debug') { |source| puts source.filename; false }
+  # add_group('debug') { |source| puts source.filename; false }
   code_tab = ENV['COVERAGE_CODE_TAB_NAME']
   test_tab = ENV['COVERAGE_TEST_TAB_NAME']
   add_group(code_tab) { |source| source.filename =~ %r"^/app/" }

diff --git a/test/id58_test_base.rb b/test/id58_test_base.rb
@@ -5,7 +5,7 @@ def require_source(required)
   require_relative "../app/code/#{required}"
 end
 
-class Id58TestBase < MiniTest::Test
+class Id58TestBase < Minitest::Test
 
   def initialize(arg)
     @id58 = nil
@@ -57,8 +57,7 @@ def trimmed(s)
 
   # - - - - - - - - - - - - - - - - - - - - - -
 
-  # :nocov:
-  ObjectSpace.define_finalizer(self, proc {
+  Minitest.after_run do
     slow = @@timings.select{ |_name,secs| secs > 0.000 }
     sorted = slow.sort_by{ |name,secs| -secs }.to_h
     size = sorted.size < 5 ? sorted.size : 5
@@ -69,8 +68,7 @@ def trimmed(s)
       break if index === size
     }
     puts
-  })
-  # :nocov:
+  end
 
   # - - - - - - - - - - - - - - - - - - - - - -
 

diff --git a/test/server/avastars_progress_test.rb → test/server/avatars_progress_test.rb b/test/server/avastars_progress_test.rb → test/server/avatars_progress_test.rb