Merge branch 'master' into copilot/finish-spring-boot-migration

Author: commjoen

Dockerfile.web

@@ -1,5 +1,5 @@
 FROM jeroenwillemsen/wrongsecrets:1.13.1-alpha5-no-vault
-ARG argBasedVersion="1.13.1-alpha5"
+ARG argBasedVersion="1.13.1-alpha5-no-vault"
 ARG CANARY_URLS="http://canarytokens.com/terms/about/s7cfbdakys13246ewd8ivuvku/post.jsp,http://canarytokens.com/terms/about/y0all60b627gzp19ahqh7rl6j/post.jsp"
 ARG CTF_ENABLED=false
 ARG HINTS_ENABLED=true