Merge pull request #3461 from kaitozaw/issue-fix-dockerfile-and-testing

issue-fix-dockerfile-and-testing

Author: zinduolis

Dockerfile

@@ -15,7 +15,7 @@
 ###########################################################################################################
 
 # ---------------------------- Start of Builder 0 - Gemset Build ------------------------------------------
-FROM ruby:3.4.7-slim-bullseye AS builder
+FROM ruby:3.4.7-slim-bookworm AS builder
 
 COPY . /beef
 
@@ -28,10 +28,12 @@ RUN echo "gem: --no-ri --no-rdoc" > /etc/gemrc \
     git \
     curl \
     xz-utils \
+    pkg-config \
     make \
     g++ \
     libcurl4-openssl-dev \
     ruby-dev \
+    libyaml-dev \
     libffi-dev \
     zlib1g-dev \
     libsqlite3-dev \
@@ -44,7 +46,7 @@ RUN echo "gem: --no-ri --no-rdoc" > /etc/gemrc \
 
 
 # ---------------------------- Start of Builder 1 - Final Build ------------------------------------------
-FROM ruby:3.4.7-slim-bullseye
+FROM ruby:3.4.7-slim-bookworm
 LABEL maintainer="Beef Project" \
       source_url="github.com/beefproject/beef" \
       homepage="https://beefproject.com/"
@@ -61,6 +63,9 @@ RUN adduser --home /beef --gecos beef --disabled-password beef \
  && apt-get update \
  && apt-get install -y --no-install-recommends \
     curl \
+    wget \
+    espeak \
+    lame \
     openssl \
     libssl-dev \
     libreadline-dev \

spec/beef/core/main/network_stack/handlers/redirector_spec.rb

@@ -32,7 +32,7 @@
     response = Curl::Easy.http_get("http://127.0.0.1:#{@port}/test/")
     expect(response.response_code).to eql(302)
     expect(response.body_str).to eql("302 found")
-    expect(response.header_str).to match(/Location: http:\/\/www.beefproject\.com/)
+    expect(response.header_str).to match(/^location:\s*http:\/\/www\.beefproject\.com\r?$/i)
   end
 
 end