Land #19502, Update docker Ruby version

.github/workflows/verify.yml

@@ -37,11 +37,7 @@ jobs:
 
       - name: docker-compose build
         run: |
-          curl -L https://github.com/docker/compose/releases/download/1.22.0/docker-compose-`uname -s`-`uname -m` > docker-compose
-          chmod +x docker-compose
-          sudo mv docker-compose /usr/bin
-
-          /usr/bin/docker-compose build
+          docker compose build
 
   test:
     runs-on: ${{ matrix.os }}

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.1.5-alpine3.18 AS builder
+FROM ruby:3.1.6-alpine3.20 AS builder
 LABEL maintainer="Rapid7"
 
 ARG BUNDLER_CONFIG_ARGS="set no-cache 'true' set system 'true' set without 'development test coverage'"

docker-compose.override.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   ms:
     build:

docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3'
 services:
   ms:
     image: metasploitframework/metasploit-framework:latest

docker/bin/msfconsole

@@ -23,8 +23,8 @@ PARAMS="$@"
 
 if [[ $PARAMS == *"--rebuild"* ]]; then
   echo "Rebuilding image"
-  docker-compose build
+  docker compose build
   exit $?
 fi
 
-docker-compose run --rm --service-ports -e MSF_UID=$(id -u) -e MSF_GID=$(id -g) ms ./msfconsole -r docker/msfconsole.rc "$PARAMS"
+docker compose run --rm --service-ports -e MSF_UID=$(id -u) -e MSF_GID=$(id -g) ms ./msfconsole -r docker/msfconsole.rc "$PARAMS"