From d9a2dba3fa740b4193f47096f8365ad2578af807 Mon Sep 17 00:00:00 2001
From: adfoster-r7 <alandavid_foster@rapid7.com>
Date: Fri, 18 Oct 2024 21:33:02 +0100
Subject: [PATCH] Update to Ruby 3.2

---
 .github/workflows/verify.yml |  2 +-
 .ruby-version                |  2 +-
 Dockerfile                   | 12 ++++--------
 docs/.ruby-version           |  2 +-
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
index 1b34628f09b17..d23c7808d2ac9 100644
--- a/.github/workflows/verify.yml
+++ b/.github/workflows/verify.yml
@@ -63,7 +63,7 @@ jobs:
           - '3.1'
           - '3.2'
           - '3.3'
-          - '3.4.0-preview1'
+          - '3.4.0-preview2'
         os:
           - ubuntu-20.04
           - ubuntu-latest
diff --git a/.ruby-version b/.ruby-version
index 3ad0595adcc26..5ae69bd5f0e84 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.1.5
+3.2.5
diff --git a/Dockerfile b/Dockerfile
index 60a13b10d663b..1870ea5c24050 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.1.6-alpine3.20 AS builder
+FROM ruby:3.2.5-alpine3.20 AS builder
 LABEL maintainer="Rapid7"
 
 ARG BUNDLER_CONFIG_ARGS="set no-cache 'true' set system 'true' set without 'development test coverage'"
@@ -53,7 +53,7 @@ RUN mkdir -p $TOOLS_HOME/bin && \
     cd go/src && \
     ./make.bash
 
-FROM ruby:3.1.5-alpine3.18
+FROM ruby:3.2.5-alpine3.20
 LABEL maintainer="Rapid7"
 ARG TARGETARCH
 
@@ -65,8 +65,8 @@ ENV METASPLOIT_GROUP=metasploit
 # used for the copy command
 RUN addgroup -S $METASPLOIT_GROUP
 
-RUN apk add --no-cache bash sqlite-libs nmap nmap-scripts nmap-nselibs \
-    postgresql-libs python3 py3-pip ncurses libcap su-exec alpine-sdk \
+RUN apk add --no-cache curl bash sqlite-libs nmap nmap-scripts nmap-nselibs \
+    postgresql-libs python3 py3-pip py3-impacket py3-requests ncurses libcap su-exec alpine-sdk \
     openssl-dev nasm
 RUN\
     if [ "${TARGETARCH}" = "arm64" ];\
@@ -74,7 +74,6 @@ RUN\
     else apk add --no-cache mingw-w64-gcc;\
     fi
 
-
 RUN /usr/sbin/setcap cap_net_raw,cap_net_bind_service=+eip $(which ruby)
 RUN /usr/sbin/setcap cap_net_raw,cap_net_bind_service=+eip $(which nmap)
 
@@ -86,9 +85,6 @@ RUN chown -R root:metasploit $APP_HOME/
 RUN chmod 664 $APP_HOME/Gemfile.lock
 RUN gem update --system
 RUN cp -f $APP_HOME/docker/database.yml $APP_HOME/config/database.yml
-RUN curl -L -O https://raw.githubusercontent.com/pypa/get-pip/f84b65709d4b20221b7dbee900dbf9985a81b5d4/public/get-pip.py && python3 get-pip.py && rm get-pip.py
-RUN pip install impacket
-RUN pip install requests
 
 ENV GOPATH=$TOOLS_HOME/go
 ENV GOROOT=$TOOLS_HOME/bin/go
diff --git a/docs/.ruby-version b/docs/.ruby-version
index 3ad0595adcc26..5ae69bd5f0e84 100644
--- a/docs/.ruby-version
+++ b/docs/.ruby-version
@@ -1 +1 @@
-3.1.5
+3.2.5