From c60bc8708c65bf3ce3e70bc3bbbd2a71ba8cedfd Mon Sep 17 00:00:00 2001
From: HoneyryderChuck <cardoso_tiago@hotmail.com>
Date: Tue, 21 May 2024 12:26:24 +0100
Subject: [PATCH] migrating from alpine to bullseye images

---
 docker-compose-ruby-2.1.yml |  3 +--
 docker-compose-ruby-2.2.yml |  3 +--
 docker-compose-ruby-2.3.yml |  3 +--
 docker-compose-ruby-2.4.yml |  3 +--
 docker-compose-ruby-2.5.yml |  3 +--
 docker-compose-ruby-2.6.yml |  3 +--
 docker-compose-ruby-2.7.yml |  3 +--
 docker-compose-ruby-3.0.yml |  2 +-
 docker-compose-ruby-3.1.yml |  2 +-
 docker-compose-ruby-3.2.yml |  2 +-
 docker-compose-ruby-3.3.yml |  2 +-
 docker-compose.yml          |  2 +-
 spec/support/specs.sh       | 20 +++++++++++++-------
 13 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/docker-compose-ruby-2.1.yml b/docker-compose-ruby-2.1.yml
index 89786a4..99fa424 100644
--- a/docker-compose-ruby-2.1.yml
+++ b/docker-compose-ruby-2.1.yml
@@ -1,5 +1,4 @@
 version: '3'
 services:
   netsnmp:
-    image: ruby:2.1-alpine
-    
\ No newline at end of file
+    image: ruby:2.1
diff --git a/docker-compose-ruby-2.2.yml b/docker-compose-ruby-2.2.yml
index d2ecc27..491ab4d 100644
--- a/docker-compose-ruby-2.2.yml
+++ b/docker-compose-ruby-2.2.yml
@@ -1,5 +1,4 @@
 version: '3'
 services:
   netsnmp:
-    image: ruby:2.2-alpine
-    
\ No newline at end of file
+    image: ruby:2.2
diff --git a/docker-compose-ruby-2.3.yml b/docker-compose-ruby-2.3.yml
index dbc3332..1903c62 100644
--- a/docker-compose-ruby-2.3.yml
+++ b/docker-compose-ruby-2.3.yml
@@ -1,5 +1,4 @@
 version: '3'
 services:
   netsnmp:
-    image: ruby:2.3-alpine
-    
\ No newline at end of file
+    image: ruby:2.3
diff --git a/docker-compose-ruby-2.4.yml b/docker-compose-ruby-2.4.yml
index b63d616..2d47cd3 100644
--- a/docker-compose-ruby-2.4.yml
+++ b/docker-compose-ruby-2.4.yml
@@ -1,5 +1,4 @@
 version: '3'
 services:
   netsnmp:
-    image: ruby:2.4-alpine
-    
\ No newline at end of file
+    image: ruby:2.4
diff --git a/docker-compose-ruby-2.5.yml b/docker-compose-ruby-2.5.yml
index 469417b..a29a7d8 100644
--- a/docker-compose-ruby-2.5.yml
+++ b/docker-compose-ruby-2.5.yml
@@ -1,5 +1,4 @@
 version: '3'
 services:
   netsnmp:
-    image: ruby:2.5-alpine
-    
\ No newline at end of file
+    image: ruby:2.5
diff --git a/docker-compose-ruby-2.6.yml b/docker-compose-ruby-2.6.yml
index 12b407a..117f663 100644
--- a/docker-compose-ruby-2.6.yml
+++ b/docker-compose-ruby-2.6.yml
@@ -1,5 +1,4 @@
 version: '3'
 services:
   netsnmp:
-    image: ruby:2.6-alpine
-    
\ No newline at end of file
+    image: ruby:2.6
diff --git a/docker-compose-ruby-2.7.yml b/docker-compose-ruby-2.7.yml
index b7ab9af..4a0b525 100644
--- a/docker-compose-ruby-2.7.yml
+++ b/docker-compose-ruby-2.7.yml
@@ -1,5 +1,4 @@
 version: '3'
 services:
   netsnmp:
-    image: ruby:2.7-alpine
-    
\ No newline at end of file
+    image: ruby:2.7
diff --git a/docker-compose-ruby-3.0.yml b/docker-compose-ruby-3.0.yml
index 15add8e..cd16de7 100644
--- a/docker-compose-ruby-3.0.yml
+++ b/docker-compose-ruby-3.0.yml
@@ -1,4 +1,4 @@
 version: '3'
 services:
   netsnmp:
-    image: ruby:3.0-alpine
+    image: ruby:3.0
diff --git a/docker-compose-ruby-3.1.yml b/docker-compose-ruby-3.1.yml
index 8073f16..d9d1d6d 100644
--- a/docker-compose-ruby-3.1.yml
+++ b/docker-compose-ruby-3.1.yml
@@ -1,4 +1,4 @@
 version: '3'
 services:
   netsnmp:
-    image: ruby:3.1-alpine
+    image: ruby:3.1
diff --git a/docker-compose-ruby-3.2.yml b/docker-compose-ruby-3.2.yml
index 464f1ca..616a39d 100644
--- a/docker-compose-ruby-3.2.yml
+++ b/docker-compose-ruby-3.2.yml
@@ -1,4 +1,4 @@
 version: '3'
 services:
   netsnmp:
-    image: ruby:3.2-alpine
+    image: ruby:3.2
diff --git a/docker-compose-ruby-3.3.yml b/docker-compose-ruby-3.3.yml
index 76bd5cb..7793cf8 100644
--- a/docker-compose-ruby-3.3.yml
+++ b/docker-compose-ruby-3.3.yml
@@ -1,4 +1,4 @@
 version: '3'
 services:
   netsnmp:
-    image: ruby:3.3-alpine
+    image: ruby:3.3
diff --git a/docker-compose.yml b/docker-compose.yml
index e1b652f..509fbc1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
       - CI=1
       - BUNDLE_SILENCE_ROOT_WARNING=1
       - BUNDLE_JOBS=10
-    image: ruby:alpine
+    image: ruby
     depends_on:
       - snmp-server-emulator
     volumes:
diff --git a/spec/support/specs.sh b/spec/support/specs.sh
index 3d25b91..be786d8 100755
--- a/spec/support/specs.sh
+++ b/spec/support/specs.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
@@ -6,15 +6,13 @@ RUBY_ENGINE=`ruby -e 'puts RUBY_ENGINE'`
 
 if [[ "$RUBY_ENGINE" = "truffleruby" ]]; then
   dnf install -y git net-snmp-utils
-elif [[ "$RUBY_ENGINE" = "jruby" ]]; then
+else
  echo "
 deb http://deb.debian.org/debian/ buster main contrib non-free
 deb http://deb.debian.org/debian/ buster-updates main contrib non-free
 deb http://security.debian.org/debian-security buster/updates main contrib non-free" >> /etc/apt/sources.list
   apt-get update
   apt-get install -y git snmp-mibs-downloader
-else
-  apk --update add g++ make git net-snmp-libs
 fi
 
 gem install bundler -v="1.17.3" --no-doc --conservative
@@ -23,17 +21,25 @@ cd /home
 bundle -v
 bundle install
 
-mkdir -p /etc/ssl
-touch /etc/ssl/openssl.cnf
-cat <<EOT >> /etc/ssl/openssl.cnf
+touch openssl_legacy.cnf
+cat <<EOT > openssl_legacy.cnf
+.include = /usr/lib/ssl/openssl.cnf
+
+[openssl_init]
+providers = provider_sect
+
 [provider_sect]
 default = default_sect
 legacy = legacy_sect
+
 [default_sect]
 activate = 1
+
 [legacy_sect]
 activate = 1
 EOT
+export OPENSSL_CONF=/home/openssl_legacy.cnf
+
 
 if [[ ${RUBY_VERSION:0:1} = "3" ]]; then
   export RUBYOPT='-rbundler/setup -rrbs/test/setup'