Skip to content

Commit

Permalink
migrating from alpine to bullseye images
Browse files Browse the repository at this point in the history
  • Loading branch information
HoneyryderChuck committed May 21, 2024
1 parent 83c3f3a commit c60bc87
Show file tree
Hide file tree
Showing 13 changed files with 25 additions and 26 deletions.
3 changes: 1 addition & 2 deletions docker-compose-ruby-2.1.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
version: '3'
services:
netsnmp:
image: ruby:2.1-alpine

image: ruby:2.1
3 changes: 1 addition & 2 deletions docker-compose-ruby-2.2.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
version: '3'
services:
netsnmp:
image: ruby:2.2-alpine

image: ruby:2.2
3 changes: 1 addition & 2 deletions docker-compose-ruby-2.3.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
version: '3'
services:
netsnmp:
image: ruby:2.3-alpine

image: ruby:2.3
3 changes: 1 addition & 2 deletions docker-compose-ruby-2.4.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
version: '3'
services:
netsnmp:
image: ruby:2.4-alpine

image: ruby:2.4
3 changes: 1 addition & 2 deletions docker-compose-ruby-2.5.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
version: '3'
services:
netsnmp:
image: ruby:2.5-alpine

image: ruby:2.5
3 changes: 1 addition & 2 deletions docker-compose-ruby-2.6.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
version: '3'
services:
netsnmp:
image: ruby:2.6-alpine

image: ruby:2.6
3 changes: 1 addition & 2 deletions docker-compose-ruby-2.7.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
version: '3'
services:
netsnmp:
image: ruby:2.7-alpine

image: ruby:2.7
2 changes: 1 addition & 1 deletion docker-compose-ruby-3.0.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '3'
services:
netsnmp:
image: ruby:3.0-alpine
image: ruby:3.0
2 changes: 1 addition & 1 deletion docker-compose-ruby-3.1.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '3'
services:
netsnmp:
image: ruby:3.1-alpine
image: ruby:3.1
2 changes: 1 addition & 1 deletion docker-compose-ruby-3.2.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '3'
services:
netsnmp:
image: ruby:3.2-alpine
image: ruby:3.2
2 changes: 1 addition & 1 deletion docker-compose-ruby-3.3.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '3'
services:
netsnmp:
image: ruby:3.3-alpine
image: ruby:3.3
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
20 changes: 13 additions & 7 deletions spec/support/specs.sh
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
#!/bin/sh
#!/bin/bash

set -e

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
Expand All @@ -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'
Expand Down

0 comments on commit c60bc87

Please sign in to comment.