Fix the new Docker create/run process so it pulls in the latest chang…

…es every time the image is run. Move the scripts into the VMs dir to centeralize the Docker stuff.
agigleux · Nov 4, 2018 · 8b56437 · 8b56437
1 parent c298394
commit 8b56437
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/VMs/Dockerfile b/VMs/Dockerfile
@@ -22,5 +22,3 @@ RUN echo bench:bench | chpasswd
 RUN chown -R bench /owasp/
 ENV PATH /owasp/benchmark/:$PATH
 
-ENTRYPOINT ["/owasp/benchmark/runRemoteAccessibleBenchmark.sh"]
-
diff --git a/scripts/buildDockerImage.sh → VMs/buildDockerImage.sh b/scripts/buildDockerImage.sh → VMs/buildDockerImage.sh
@@ -1,3 +1,3 @@
 docker image rm benchmark:latest
-docker build -t benchmark VMs/
+docker build -t benchmark .
 
diff --git a/VMs/runDockerImage.sh b/VMs/runDockerImage.sh
@@ -0,0 +1,2 @@
+docker run -t -i -p 8443:8443 --rm benchmark /bin/bash -c "git pull && ./runRemoteAccessibleBenchmark.sh"
+
diff --git a/scripts/runDockerImage.sh b/scripts/runDockerImage.sh
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,5 +22,3 @@ RUN echo bench:bench \| chpasswd
		RUN chown -R bench /owasp/
		ENV PATH /owasp/benchmark/:$PATH

		ENTRYPOINT ["/owasp/benchmark/runRemoteAccessibleBenchmark.sh"]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		docker run -t -i -p 8443:8443 --rm benchmark /bin/bash -c "git pull && ./runRemoteAccessibleBenchmark.sh"