Updates to platform-image-builder needed for webgoat demo

Author: Owen Jones

platform-image-builder/Dockerfile

@@ -9,4 +9,4 @@ RUN apt-get install -y cmake g++ flex bison doxygen patch python3
 
 ADD build-security-analyzer.sh /build-security-analyzer.sh
 
-ENTRYPOINT bash /build-security-analyzer.sh
+ENTRYPOINT ["/build-security-analyzer.sh"]

platform-image-builder/README

@@ -3,9 +3,9 @@ expected by Diffblue's platform and export a tarball suitable for building the
 security scanner platform image.
 
 Pre-requisite: the deeptest-base Docker image must be available to build
-against. If it isn't already present (try
-`docker image inspect eu.gcr.io/diffblue-cr/deeptest-base`),
-build it by:
+against. If it isn't already present, i.e. 
+`docker image inspect eu.gcr.io/diffblue-cr/deeptest-base` does not give any
+output, build it by:
 
 $ git clone https://github.com/diffblue/platform
 $ cd platform/docker/docker-jobs
@@ -17,6 +17,8 @@ $ cd $REPO_ROOT/platform-image-builder
 $ mkdir -p /tmp/output-dir # for example
 $ ./make-security-release.sh /tmp/output-dir [branch-or-commit]
 
+'branch-or-commit' refers to the github repository, not your local repository.
+
 If 'branch-or-commit' is not specified we'll build a release tarball from the
 tip of 'develop'.
 

platform-image-builder/build-security-analyzer.sh

@@ -1,3 +1,5 @@
+#!/bin/sh
+
 # Runs inside the security-analyzer-builder container.
 
 set -e
@@ -9,9 +11,9 @@ fi
 
 cd /
 git clone [email protected]:diffblue/security-scanner
-if [ $# -eq 1 ]; then git checkout $1; fi
 
 cd security-scanner
+if [ $# -eq 1 ]; then git checkout $1; fi
 git submodule update --init
 
 mkdir build
@@ -28,6 +30,7 @@ mkdir /tmp/release/lib
 cp dist/lib/libboost* /tmp/release/lib/
 cp -r dist/lib/driver/*.py /tmp/release
 cp src/java-class-info/default_config.json /tmp/release
+cp benchmarks/LIBRARIES/models/model/target/models.jar /tmp/release
 
 cd /tmp/release
 tar cvzf /output/release.tar.gz .

platform-image-builder/make-security-release.sh

@@ -10,7 +10,7 @@ if [ $# -lt 1 ]; then
   exit 1
 fi
 
-docker image inspect security-analyzer-builder:latest >/dev/null 2>&1 || ./create-builder-image.sh
+./create-builder-image.sh
 
 mkdir -p $1