Compare commits

..
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
marc bebba655a6 ok 2022-02-18 14:51:17 +01:00
4 changed files with 31 additions and 4 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
+2 -4
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.=
@@ -35,7 +35,7 @@ RUN chmod -R a+r /usr/local/bundle
# ---------------------------- Start of Builder 1 - Final Build ------------------------------------------
FROM ruby:2.7.5-alpine
FROM ruby:3.0-alpine
LABEL maintainer="Beef Project: github.com/beefproject/beef"
# Create service account to run BeEF
@@ -60,7 +60,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 -------------------------------------------------
+4
View File
@@ -0,0 +1,4 @@
push: build
docker push marcpartensky/beef
build:
docker build . -t marcpartensky/beef
+15
View File
@@ -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"