Skip to content

Commit 1623acf

Browse files
kersevankersevan
committed
Add my results and Docker fixes
1 parent 9dafe2e commit 1623acf

File tree

122 files changed

+700659
-1327508
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+700659
-1327508
lines changed

‎VMs/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# This dockerfile builds a container that pulls down and runs the latest version of Benchmark
22
FROM ubuntu:latest
3-
MAINTAINER "Dave Wichers dave.wichers@owasp.org"
43

54
RUN apt-get update
65
RUN DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata
@@ -17,13 +16,15 @@ RUN mkdir /owasp
1716
WORKDIR /owasp
1817

1918
# Download, build, install Benchmark Utilities required by crawler and scorecard generation
20-
RUN git clone https://github.com/OWASP-Benchmark/BenchmarkUtils.git
19+
# RUN git clone https://github.com/OWASP-Benchmark/BenchmarkUtils.git
20+
RUN git clone https://github.com/kersevan/BenchmarkUtils.git
2121
WORKDIR /owasp/BenchmarkUtils
2222
RUN mvn install
2323

2424
# Download, build BenchmarkJava
2525
WORKDIR /owasp
26-
RUN git clone https://github.com/OWASP-Benchmark/BenchmarkJava
26+
# RUN git clone https://github.com/OWASP-Benchmark/BenchmarkJava
27+
RUN git clone https://github.com/kersevan/BenchmarkJava
2728

2829
# Workaround for security fix for CVE-2022-24765
2930
RUN git config --global --add safe.directory /owasp/BenchmarkJava

‎VMs/buildDockerImage.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ fi
99

1010
# Since Docker doesn't auto delete anything, just like for the Ubunto update, delete any existing benchmark:latest image before building a new one
1111
docker image rm benchmark:latest
12-
docker build -t benchmark .
12+
docker build --network=host -t benchmark .
1313

‎VMs/runDockerImage.sh‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,13 @@
1-
docker run -t -i -p 8443:8443 --rm benchmark /bin/bash -c "git pull && ./runRemoteAccessibleBenchmark.sh"
1+
#docker run -t -i -p 8443:8443 --rm benchmark /bin/bash -c "git pull && ./runRemoteAccessibleBenchmark.sh"
2+
#docker run -t -i -p 8443:8443 --rm benchmark /bin/bash # -v ../results/:/owasp/BenchmarkJava/results/ -v ../scorecard/:/owasp/BenchmarkJava/scorecard/ # -c "git pull && ./runRemoteAccessibleBenchmark.sh"
3+
#docker run -t -i -p 8443:8443 --rm benchmark --volume ../results/:/owasp/BenchmarkJava/results/ --volume ../scorecard/:/owasp/BenchmarkJava/scorecard/ /bin/bash # -c "git pull && ./runRemoteAccessibleBenchmark.sh"
4+
docker run -t -i -p 8443:8443 --rm \
5+
--volume /home/greggor/MAG/BenchmarkJava/results:/owasp/BenchmarkJava/results/ \
6+
--volume /home/greggor/MAG/BenchmarkJava/scorecard:/owasp/BenchmarkJava/scorecard/ \
7+
benchmark /bin/bash -c "./createScorecards.sh"
8+
# benchmark /bin/bash -c "codeql"
9+
#benchmark /bin/bash -c "../../Tools/codeql-home/codeql/codeql database create owasp-benchmark --language=java"
210

11+
12+
13+
# /owasp/BenchmarkUtils/plugin/src/main/java/org/owasp/benchmarkutils/score/parsers

‎results/Benchmark_1.2-ZAPweekly-20150824-18000.xml‎

Lines changed: 0 additions & 945480 deletions
This file was deleted.

0 commit comments

Comments
 (0)