dubey/WebGoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move to different base image for Java

Browse Source 
This way we can also support arm/v7
This commit is contained in:
Nanne Baars
2021-10-23 20:57:16 +02:00
committed by Nanne Baars
parent cc0d0fa2a6
commit 981fcb3ebc
5 changed files with 35 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
webgoat-server/src/main/java/org/owasp/webgoat/StartWebGoat.java
View File

@ -50,26 +50,26 @@ public class StartWebGoat extends SpringBootServletInitializer {
public static void main(String[] args) {
log.info("Starting WebGoat with args: {}", StringUtils.arrayToCommaDelimitedString(args));
System.setProperty("spring.config.name", "application-webgoat");
String webgoatPort = System.getenv("WEBGOAT_PORT");
String databasePort = System.getenv("WEBGOAT_HSQLPORT");
String webGoatHost = null==System.getenv("WEBGOAT_HOST")?"127.0.0.1":System.getenv("WEBGOAT_HOST");
int goatPort = webgoatPort == null?8080:Integer.parseInt(webgoatPort);
int dbPort = databasePort == null?9001:Integer.parseInt(databasePort);
String webgoatPort = System.getenv("WEBGOAT_PORT");
String databasePort = System.getenv("WEBGOAT_HSQLPORT");
String webGoatHost = null == System.getenv("WEBGOAT_HOST") ? "127.0.0.1" : System.getenv("WEBGOAT_HOST");
int goatPort = webgoatPort == null ? 8080 : Integer.parseInt(webgoatPort);
int dbPort = databasePort == null ? 9001 : Integer.parseInt(databasePort);
if (isAlreadyRunning(webGoatHost, goatPort)) {
log.error("Port {}:{} is already in use", webGoatHost, goatPort);
System.out.println("Port "+webGoatHost+":"+goatPort+" is in use. Use environment value WEBGOAT_PORT to set a different value.");
System.exit(-1);
log.error("Port {}:{} is already in use", webGoatHost, goatPort);
System.out.println("Port " + webGoatHost + ":" + goatPort + " is in use. Use environment value WEBGOAT_PORT to set a different value.");
System.exit(-1);
}
if (isAlreadyRunning(webGoatHost, dbPort)) {
log.error("Port {}:{} is already in use", webGoatHost, goatPort);
System.out.println("Port "+webGoatHost+":"+goatPort+" is in use. Use environment value WEBGOAT_HSQLPORT to set a different value.");
System.exit(-1);
log.error("Port {}:{} is already in use", webGoatHost, goatPort);
System.out.println("Port " + webGoatHost + ":" + goatPort + " is in use. Use environment value WEBGOAT_HSQLPORT to set a different value.");
System.exit(-1);
}
SpringApplication.run(StartWebGoat.class, args);
}
private static boolean isAlreadyRunning(String host, int port) {
try (var ignored = new Socket(host, port)) {
return true;