slash

config.yaml
Revert "new username"
2022-02-23 23:07:13 +01:00 · 2022-02-23 23:06:34 +01:00 · 2022-02-23 23:04:09 +01:00 · 2022-02-23 23:03:36 +01:00 · 2022-02-23 22:59:41 +01:00 · 2022-02-23 22:59:26 +01:00
4 changed files with 28 additions and 19 deletions
@@ -6,6 +6,5 @@ README.md
 generate-certificate
 RESTful-API.postman_collection.json
 install
-beef
 .git
 .github
@@ -21,17 +21,11 @@ RUN echo "gem: --no-ri --no-rdoc" > /etc/gemrc

 COPY . /beef

-# RUN gem install bundler -v 2.1.4
-# RUN apk update
-# RUN apk add ruby=2.6.3
-# RUN gem install bundler -v 2
-
 # Add bundler/gem dependencies and then install
-RUN apk add --no-cache git curl libcurl curl-dev ruby-dev libffi-dev make g++ gcc musl-dev zlib-dev sqlite-dev
-RUN bundle install --system --no-cache --gemfile=/beef/Gemfile $BUNDLER_ARGS
-# RUN bundle clean --force
-# Temp fix for https://github.com/bundler/bundler/issues/6680
-RUN rm -rf /usr/local/bundle/cache
+RUN apk add --no-cache git curl libcurl curl-dev ruby-dev libffi-dev make g++ gcc musl-dev zlib-dev sqlite-dev && \
+  bundle install --gemfile=/beef/Gemfile $BUNDLER_ARGS && \
+  # Temp fix for https://github.com/bundler/bundler/issues/6680
+  rm -rf /usr/local/bundle/cache

 WORKDIR /beef

@@ -41,7 +35,7 @@ RUN chmod -R a+r /usr/local/bundle


 # ---------------------------- Start of Builder 1 - Final Build ------------------------------------------
-FROM ruby:2.6.3-alpine
+FROM ruby:3.0-alpine
 LABEL maintainer="Beef Project: github.com/beefproject/beef"

 # Create service account to run BeEF
@@ -56,7 +50,7 @@ COPY --from=builder /usr/local/bundle /usr/local/bundle
 RUN chown -R beef:beef /beef

 # Install BeEF's runtime dependencies
-RUN apk add --no-cache curl git build-base openssl readline-dev zlib zlib-dev libressl-dev yaml-dev sqlite-dev sqlite libxml2-dev libxslt-dev autoconf libc6-compat ncurses5 automake libtool bison nodejs
+RUN apk add --no-cache curl git build-base openssl readline-dev zlib zlib-dev libressl-dev yaml-dev sqlite-dev sqlite libxml2-dev libxslt-dev autoconf libc6-compat ncurses automake libtool bison nodejs

 WORKDIR /beef

@@ -37,7 +37,7 @@ GEM
      rack-test (>= 0.6.3)
      regexp_parser (>= 1.5, < 3.0)
      xpath (~> 3.2)
-    childprocess (3.0.0)
+    childprocess (4.1.0)
    coderay (1.1.3)
    concurrent-ruby (1.1.9)
    console (1.13.1)
@@ -131,7 +131,7 @@ GEM
      rqrcode_core (~> 0.1)
    racc (1.6.0)
    rack (2.2.3)
-    rack-protection (2.1.0)
+    rack-protection (2.2.0)
      rack
    rack-test (1.1.0)
      rack (>= 1.0, < 3)
@@ -180,14 +180,15 @@ GEM
    rushover (0.3.0)
      json
      rest-client
-    selenium-webdriver (3.142.7)
-      childprocess (>= 0.5, < 4.0)
+    selenium-webdriver (4.1.0)
+      childprocess (>= 0.5, < 5.0)
+      rexml (~> 3.2, >= 3.2.5)
      rubyzip (>= 1.2.2)
    simple_oauth (0.3.1)
-    sinatra (2.1.0)
+    sinatra (2.2.0)
      mustermann (~> 1.0)
      rack (~> 2.2)
-      rack-protection (= 2.1.0)
+      rack-protection (= 2.2.0)
      tilt (~> 2.0)
    slack-notifier (2.4.0)
    sqlite3 (1.4.2)
@@ -0,0 +1,15 @@
+version: "3.9"
+services:
+  beef:
+    image: marcpartensky/beef
+    restart: unless-stopped
+    build:
+      context: .
+      dockerfile: ./Dockerfile
+    volumes:
+      - ./config.yaml:/beef/config.yaml
+    ports:
+      - "3000:3000"
+      - "6789:6789"
+      - "61985:61985"
+      - "61986:61986"
Author	SHA1	Message	Date
marc	1b47a13d78	slash	2022-02-23 23:07:13 +01:00
marc	c39fb24813	config.yaml	2022-02-23 23:06:34 +01:00
marc	1245bba41a	Revert "new username" This reverts commit `58d7351138`.	2022-02-23 23:04:09 +01:00
marc	58d7351138	new username	2022-02-23 23:03:36 +01:00
dependabot[bot]	f91cfd661e	Bump selenium-webdriver from 3.142.7 to 4.1.0 (#2260 ) Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.142.7 to 4.1.0. - [Release notes](https://github.com/SeleniumHQ/selenium/releases) - [Changelog](https://github.com/SeleniumHQ/selenium/blob/trunk/rb/CHANGES) - [Commits](https://github.com/SeleniumHQ/selenium/commits/selenium-4.1.0) --- updated-dependencies: - dependency-name: selenium-webdriver dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-02-23 22:59:41 +01:00
marc	f7ea90141e	fix	2022-02-23 22:59:26 +01:00
dependabot[bot]	47300fcdda	Bump sinatra from 2.1.0 to 2.2.0 (#2298 ) Bumps [sinatra](https://github.com/sinatra/sinatra) from 2.1.0 to 2.2.0. - [Release notes](https://github.com/sinatra/sinatra/releases) - [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v2.1.0...v2.2.0) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-02-23 22:58:36 +01:00
marc	5144daf37f	Merge branch 'fix-dockerfile' into docker-compose	2022-02-18 14:57:44 +01:00
marc	57700ca4f9	beef back	2022-02-18 14:57:24 +01:00
marc	398b920665	fix	2022-02-18 14:55:48 +01:00