From 566a7f1c36c4c5fe5dd04ac3ed5ad485ce2be692 Mon Sep 17 00:00:00 2001
From: adfoster-r7 <alandavid_foster@rapid7.com>
Date: Wed, 25 Sep 2024 16:27:37 +0100
Subject: [PATCH] Update docker Ruby version

---
 .github/workflows/verify.yml | 6 +-----
 Dockerfile                   | 2 +-
 docker-compose.override.yml  | 2 --
 docker-compose.yml           | 1 -
 docker/bin/msfconsole        | 4 ++--
 5 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
index ed70f8bb89..1b34628f09 100644
--- a/.github/workflows/verify.yml
+++ b/.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 }}
diff --git a/Dockerfile b/Dockerfile
index a1fb235f3e..60a13b10d6 100644
--- a/Dockerfile
+++ b/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'"
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 9f41384d24..11f46b4dc2 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   ms:
     build:
diff --git a/docker-compose.yml b/docker-compose.yml
index 65bfcc5143..e4b1d12d7d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   ms:
     image: metasploitframework/metasploit-framework:latest
diff --git a/docker/bin/msfconsole b/docker/bin/msfconsole
index 50f37a5d22..afd8a6a7a9 100755
--- a/docker/bin/msfconsole
+++ b/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"