From 5389211e072107442c4b20334b127b3ef953afa6 Mon Sep 17 00:00:00 2001 From: Alex Taylor Date: Thu, 23 Mar 2017 12:01:04 -0400 Subject: [PATCH 1/2] Added a index not found check which throws error Added a check to make sure that the default IP exists in the container to make sure that the return is non-null --- .../cloudbees/jenkins/plugins/docker_build_env/Docker.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/cloudbees/jenkins/plugins/docker_build_env/Docker.java b/src/main/java/com/cloudbees/jenkins/plugins/docker_build_env/Docker.java index e19c0eb..12deeff 100644 --- a/src/main/java/com/cloudbees/jenkins/plugins/docker_build_env/Docker.java +++ b/src/main/java/com/cloudbees/jenkins/plugins/docker_build_env/Docker.java @@ -294,6 +294,11 @@ private String getDocker0Ip(Launcher launcher, String image) throws IOException, String route = out.toString("UTF-8").trim(); + // ensures that the the default IP exists so that the return is not null + if (route.indexOf("default") == -1){ + throw new RuntimeException("Default IP does not exist"); + } + // equivalent to `awk '/default/ { print $3 }'` but we can't assume awk is available String dockerhost = route.substring(route.indexOf("default")) .split(" ")[2]; return dockerhost; From 5f23092644fb2c3a75a243f1b96629d287104cd8 Mon Sep 17 00:00:00 2001 From: Alex Taylor Date: Tue, 28 Mar 2017 11:58:21 -0400 Subject: [PATCH 2/2] Update Docker.java --- .../com/cloudbees/jenkins/plugins/docker_build_env/Docker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/cloudbees/jenkins/plugins/docker_build_env/Docker.java b/src/main/java/com/cloudbees/jenkins/plugins/docker_build_env/Docker.java index 12deeff..ba508b5 100644 --- a/src/main/java/com/cloudbees/jenkins/plugins/docker_build_env/Docker.java +++ b/src/main/java/com/cloudbees/jenkins/plugins/docker_build_env/Docker.java @@ -295,7 +295,7 @@ private String getDocker0Ip(Launcher launcher, String image) throws IOException, String route = out.toString("UTF-8").trim(); // ensures that the the default IP exists so that the return is not null - if (route.indexOf("default") == -1){ + if (!route.contains("default")) { throw new RuntimeException("Default IP does not exist"); }