Skip to content

Commit b7a71b3

Browse files
Land rapid7#19502, Update docker Ruby version
2 parents 97038a7 + 566a7f1 commit b7a71b3

File tree

5 files changed

+4
-11
lines changed

5 files changed

+4
-11
lines changed

.github/workflows/verify.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,7 @@ jobs:
3737

3838
- name: docker-compose build
3939
run: |
40-
curl -L https://github.com/docker/compose/releases/download/1.22.0/docker-compose-`uname -s`-`uname -m` > docker-compose
41-
chmod +x docker-compose
42-
sudo mv docker-compose /usr/bin
43-
44-
/usr/bin/docker-compose build
40+
docker compose build
4541
4642
test:
4743
runs-on: ${{ matrix.os }}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:3.1.5-alpine3.18 AS builder
1+
FROM ruby:3.1.6-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'"

docker-compose.override.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: '3'
2-
31
services:
42
ms:
53
build:

docker-compose.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
version: '3'
21
services:
32
ms:
43
image: metasploitframework/metasploit-framework:latest

docker/bin/msfconsole

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ PARAMS="$@"
2323

2424
if [[ $PARAMS == *"--rebuild"* ]]; then
2525
echo "Rebuilding image"
26-
docker-compose build
26+
docker compose build
2727
exit $?
2828
fi
2929

30-
docker-compose run --rm --service-ports -e MSF_UID=$(id -u) -e MSF_GID=$(id -g) ms ./msfconsole -r docker/msfconsole.rc "$PARAMS"
30+
docker compose run --rm --service-ports -e MSF_UID=$(id -u) -e MSF_GID=$(id -g) ms ./msfconsole -r docker/msfconsole.rc "$PARAMS"

0 commit comments

Comments
 (0)