Compare commits

..
Author SHA1 Message Date
marc 57700ca4f9 beef back 2022-02-18 14:57:24 +01:00
marc bebba655a6 ok 2022-02-18 14:51:17 +01:00
4 changed files with 33 additions and 16 deletions
+10
View File
@@ -0,0 +1,10 @@
Makefile
Dockerfile
INSTALL.txt
README.md
*pem
generate-certificate
RESTful-API.postman_collection.json
install
.git
.github
+13 -9
View File
@@ -10,7 +10,7 @@
###########################################################################################################
# ---------------------------- Start of Builder 0 - Gemset Build ------------------------------------------
FROM ruby:2.7.5-alpine AS builder
FROM ruby:3.0-alpine AS builder
LABEL maintainer="Beef Project: github.com/beefproject/beef"
# Install gems in parallel with 4 workers to expedite build process.=
@@ -21,11 +21,17 @@ 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 && \
bundle install --gemfile=/beef/Gemfile $BUNDLER_ARGS && \
# Temp fix for https://github.com/bundler/bundler/issues/6680
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
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
WORKDIR /beef
@@ -35,7 +41,7 @@ RUN chmod -R a+r /usr/local/bundle
# ---------------------------- Start of Builder 1 - Final Build ------------------------------------------
FROM ruby:2.7.5-alpine
FROM ruby:2.6.3-alpine
LABEL maintainer="Beef Project: github.com/beefproject/beef"
# Create service account to run BeEF
@@ -50,7 +56,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 ncurses 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 ncurses5 automake libtool bison nodejs
WORKDIR /beef
@@ -60,7 +66,5 @@ USER beef
# Expose UI, Proxy, WebSocket server, and WebSocketSecure server
EXPOSE 3000 6789 61985 61986
HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 CMD [ "curl", "-fS", "localhost:3000" ]
ENTRYPOINT ["/beef/beef"]
# ------------------------------------- End of Builder 1 -------------------------------------------------
+6 -7
View File
@@ -37,7 +37,7 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
childprocess (4.1.0)
childprocess (3.0.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.2.0)
rack-protection (2.1.0)
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
@@ -180,15 +180,14 @@ GEM
rushover (0.3.0)
json
rest-client
selenium-webdriver (4.1.0)
childprocess (>= 0.5, < 5.0)
rexml (~> 3.2, >= 3.2.5)
selenium-webdriver (3.142.7)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
simple_oauth (0.3.1)
sinatra (2.2.0)
sinatra (2.1.0)
mustermann (~> 1.0)
rack (~> 2.2)
rack-protection (= 2.2.0)
rack-protection (= 2.1.0)
tilt (~> 2.0)
slack-notifier (2.4.0)
sqlite3 (1.4.2)
+4
View File
@@ -0,0 +1,4 @@
push: build
docker push marcpartensky/beef
build:
docker build . -t marcpartensky/beef