Skip to content

Commit 69dabe6

Browse files
committed
Update to Ruby 3.2
1 parent 26d8d23 commit 69dabe6

File tree

5 files changed

+9
-13
lines changed

5 files changed

+9
-13
lines changed

.github/workflows/verify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
- '3.1'
6464
- '3.2'
6565
- '3.3'
66-
- '3.4.0-preview1'
66+
- '3.4.0-preview2'
6767
os:
6868
- ubuntu-20.04
6969
- ubuntu-latest

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1.5
1+
3.2.5

Dockerfile

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:3.1.6-alpine3.20 AS builder
1+
FROM ruby:3.2.5-alpine3.20 AS builder
22
LABEL maintainer="Rapid7"
33

44
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 && \
5353
cd go/src && \
5454
./make.bash
5555

56-
FROM ruby:3.1.5-alpine3.18
56+
FROM ruby:3.2.5-alpine3.20
5757
LABEL maintainer="Rapid7"
5858
ARG TARGETARCH
5959

@@ -65,16 +65,15 @@ ENV METASPLOIT_GROUP=metasploit
6565
# used for the copy command
6666
RUN addgroup -S $METASPLOIT_GROUP
6767

68-
RUN apk add --no-cache bash sqlite-libs nmap nmap-scripts nmap-nselibs \
69-
postgresql-libs python3 py3-pip ncurses libcap su-exec alpine-sdk \
68+
RUN apk add --no-cache curl bash sqlite-libs nmap nmap-scripts nmap-nselibs \
69+
postgresql-libs python3 py3-pip py3-impacket py3-requests ncurses libcap su-exec alpine-sdk \
7070
openssl-dev nasm
7171
RUN\
7272
if [ "${TARGETARCH}" = "arm64" ];\
7373
then apk add --no-cache gcc musl-dev python3-dev libffi-dev gcompat;\
7474
else apk add --no-cache mingw-w64-gcc;\
7575
fi
7676

77-
7877
RUN /usr/sbin/setcap cap_net_raw,cap_net_bind_service=+eip $(which ruby)
7978
RUN /usr/sbin/setcap cap_net_raw,cap_net_bind_service=+eip $(which nmap)
8079

@@ -86,9 +85,6 @@ RUN chown -R root:metasploit $APP_HOME/
8685
RUN chmod 664 $APP_HOME/Gemfile.lock
8786
RUN gem update --system
8887
RUN cp -f $APP_HOME/docker/database.yml $APP_HOME/config/database.yml
89-
RUN curl -L -O https://raw.githubusercontent.com/pypa/get-pip/f84b65709d4b20221b7dbee900dbf9985a81b5d4/public/get-pip.py && python3 get-pip.py && rm get-pip.py
90-
RUN pip install impacket
91-
RUN pip install requests
9288

9389
ENV GOPATH=$TOOLS_HOME/go
9490
ENV GOROOT=$TOOLS_HOME/bin/go

docs/.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1.5
1+
3.2.5

docs/metasploit-framework.wiki/dev/Setting-Up-a-Metasploit-Development-Environment.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ Regardless of your choice, you'll want to make sure that, when inside the `~/git
101101
```
102102
$ cd ~/git/metasploit-framework
103103
$ cat .ruby-version
104-
3.0.2
104+
3.2.5
105105
$ ruby -v
106-
ruby 3.0.2p107 (2021-07-07 revision 0db68f0233) [x86_64-linux]
106+
ruby 3.2.5 (2024-07-26 revision 31d0f1a2e7) [x86_64-darwin23]
107107
```
108108

109109
Note: the Ruby version is likely to change over time, so don't rely on the output in the above example. Instead, confirm your `ruby -v` output with the version number listed in the `.ruby-version` file.

0 commit comments

Comments
 (0)