From 6090cefa4f64ac4de5cd1c70c0b2b1dec1aac190 Mon Sep 17 00:00:00 2001 From: "aidan.hall34" Date: Thu, 12 Jan 2023 14:16:58 +0000 Subject: [PATCH 1/2] Updated Dockerfile and CONTRIBUTING docs --- CONTRIBUTING.md | 38 +++++++++++++++++++------------------- Dockerfile | 3 +-- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a38d254..0ec6c8a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -76,35 +76,35 @@ Now that you have a copy of your fork, there is work you will need to do to keep Do this prior to every time you create a branch for a PR: -1. Make sure you are on the `master` branch +1. Make sure you are on the `main` branch > ```sh > $ git status - > On branch master - > Your branch is up-to-date with 'origin/master'. + > On branch main + > Your branch is up-to-date with 'origin/main'. > ``` - > If your aren't on `master`, resolve outstanding files and commits and checkout the `master` branch + > If your aren't on `main`, resolve outstanding files and commits and checkout the `main` branch > ```sh - > $ git checkout master + > $ git checkout main > ``` 2. Do a pull with rebase against `upstream` > ```sh - > $ git pull --rebase upstream master + > $ git pull --rebase upstream main > ``` - > This will pull down all of the changes to the official master branch, without making an additional commit in your local repo. + > This will pull down all of the changes to the official main branch, without making an additional commit in your local repo. -3. (_Optional_) Force push your updated master branch to your GitHub fork +3. (_Optional_) Force push your updated main branch to your GitHub fork > ```sh - > $ git push origin master --force + > $ git push origin main --force > ``` - > This will overwrite the master branch of your fork. + > This will overwrite the main branch of your fork. ### Creating a branch @@ -214,20 +214,20 @@ GitHub has a good guide on how to contribute to open source [here](https://opens ##### Editing via your local fork -1. Perform the maintenance step of rebasing `master` -2. Ensure you're on the `master` branch using `git status`: +1. Perform the maintenance step of rebasing `main` +2. Ensure you're on the `main` branch using `git status`: ```sh $ git status -On branch master -Your branch is up-to-date with 'origin/master'. +On branch main +Your branch is up-to-date with 'origin/main'. nothing to commit, working directory clean ``` -1. If you're not on master or your working directory is not clean, resolve - any outstanding files/commits and checkout master `git checkout master` -2. Create a branch off of `master` with git: `git checkout -B +1. If you're not on main or your working directory is not clean, resolve + any outstanding files/commits and checkout main `git checkout main` +2. Create a branch off of `main` with git: `git checkout -B branch/name-here` 3. Edit your file(s) locally with the editor of your choice 4. Check your `git status` to see unstaged files @@ -239,8 +239,8 @@ nothing to commit, working directory clean 8. Push your commits to your GitHub Fork: `git push -u origin branch/name-here` 9. Once the edits have been committed, you will be prompted to create a pull request on your fork's GitHub page -10. By default, all pull requests should be against the `master` branch -11. Submit a pull request from your branch to feroxbuster's `master` branch +10. By default, all pull requests should be against the `main` branch +11. Submit a pull request from your branch to feroxbuster's `main` branch 12. The title (also called the subject) of your PR should be descriptive of your changes and succinctly indicate what is being fixed - Examples: `Add test cases for Unicode support`; `Correct typo in overview documentation` diff --git a/Dockerfile b/Dockerfile index b445bc1..c9048c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,7 @@ FROM alpine@sha256:69704ef328d05a9f806b6b8502915e6a0a4faa4d72018dc42343f511490daf8a as build LABEL maintainer="wfnintr@null.net" -RUN sed -i -e 's/v[[:digit:]]\..*\//edge\//g' /etc/apk/repositories \ - && apk upgrade --update-cache --available && apk add --update openssl +RUN apk upgrade --update-cache --available && apk add --update openssl # Download latest release From e4dc7da756d643564545d33e7ccccd0fcc4ad2d4 Mon Sep 17 00:00:00 2001 From: "aidan.hall34" Date: Thu, 12 Jan 2023 23:34:03 +0000 Subject: [PATCH 2/2] Remove edge branch, update alpine --- Dockerfile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index c9048c6..ba141a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,15 @@ -# Image: alpine:3.14.2 -FROM alpine@sha256:69704ef328d05a9f806b6b8502915e6a0a4faa4d72018dc42343f511490daf8a as build +FROM alpine:3.17.1 as build LABEL maintainer="wfnintr@null.net" RUN apk upgrade --update-cache --available && apk add --update openssl - # Download latest release RUN wget https://github.com/epi052/feroxbuster/releases/latest/download/x86_64-linux-feroxbuster.zip -qO feroxbuster.zip \ && unzip -d /tmp/ feroxbuster.zip feroxbuster \ && chmod +x /tmp/feroxbuster \ && wget https://raw.githubusercontent.com/danielmiessler/SecLists/master/Discovery/Web-Content/raft-medium-directories.txt -O /tmp/raft-medium-directories.txt -# Image: alpine:3.14.2 -FROM alpine@sha256:69704ef328d05a9f806b6b8502915e6a0a4faa4d72018dc42343f511490daf8a as release - +from alpine:3.17.1 as release COPY --from=build /tmp/raft-medium-directories.txt /usr/share/seclists/Discovery/Web-Content/raft-medium-directories.txt COPY --from=build /tmp/feroxbuster /usr/local/bin/feroxbuster