From 62cd4f3227e635f5a00215aae11dc71009526359 Mon Sep 17 00:00:00 2001
From: amolka <amolka.kashetwar@openmarket.com>
Date: Tue, 4 Sep 2018 10:17:05 +0100
Subject: [PATCH 1/3] Adding container name to error message along with
 internal port, helpful when you have multiple containers with service running
 on same internal port

---
 .../java/com/palantir/docker/compose/connection/Container.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/Container.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/Container.java
index 2e506c2d6..fac94519b 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/Container.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/Container.java
@@ -60,7 +60,7 @@ public SuccessOrFailure portIsListeningOnHttp(int internalPort, Function<DockerP
                 return SuccessOrFailure.failure("Internal port " + internalPort + " is not listening in container " + containerName);
             }
             return port.isHttpRespondingSuccessfully(urlFunction, andCheckStatus)
-                    .mapFailure(failureMessage -> internalPort + " does not have a http response from " + urlFunction.apply(port) + ":\n" + failureMessage);
+                    .mapFailure(failureMessage -> containerName+":"+internalPort + " does not have a http response from " + urlFunction.apply(port) + ":\n" + failureMessage);
         } catch (Exception e) {
             return SuccessOrFailure.fromException(e);
         }

From 8f0761ed0ce6cb4003624864c55bb79805ed9770 Mon Sep 17 00:00:00 2001
From: amolka <amolka.kashetwar@openmarket.com>
Date: Tue, 4 Sep 2018 10:59:24 +0100
Subject: [PATCH 2/3] Adding config file for circle ci

---
 .circleci/config.yml | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 .circleci/config.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 000000000..51d676f46
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,36 @@
+machine:
+  pre:
+    - curl -sSL https://s3.amazonaws.com/circle-downloads/install-circleci-docker.sh | bash -s -- 1.10.0
+  java:
+    version: oraclejdk8
+  services:
+    - docker
+  environment:
+    TERM: dumb
+
+dependencies:
+  pre:
+    - sudo pip install docker-compose
+  override:
+    - ./gradlew resolveConfigurations
+
+test:
+  override:
+    - ? >
+        case $CIRCLE_NODE_INDEX in
+        0) ./gradlew test --info ;;
+        1) ./gradlew checkstyleMain checkstyleTest javadoc --info ;;
+        esac
+      :
+        parallel: true
+        timeout: 1200
+
+general:
+  artifacts:
+    - build/reports
+
+deployment:
+  release:
+    tag: /[0-9]+(\.[0-9]+)+/
+    commands:
+      - ./gradlew -i bintrayUpload

From 27e485c2101bf5e1f4919c2a9b0741630b988c33 Mon Sep 17 00:00:00 2001
From: saavkaar <saavkaar@gmail.com>
Date: Thu, 18 Oct 2018 16:10:22 +0100
Subject: [PATCH 3/3] Delete config.yml

---
 .circleci/config.yml | 36 ------------------------------------
 1 file changed, 36 deletions(-)
 delete mode 100644 .circleci/config.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index 51d676f46..000000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-machine:
-  pre:
-    - curl -sSL https://s3.amazonaws.com/circle-downloads/install-circleci-docker.sh | bash -s -- 1.10.0
-  java:
-    version: oraclejdk8
-  services:
-    - docker
-  environment:
-    TERM: dumb
-
-dependencies:
-  pre:
-    - sudo pip install docker-compose
-  override:
-    - ./gradlew resolveConfigurations
-
-test:
-  override:
-    - ? >
-        case $CIRCLE_NODE_INDEX in
-        0) ./gradlew test --info ;;
-        1) ./gradlew checkstyleMain checkstyleTest javadoc --info ;;
-        esac
-      :
-        parallel: true
-        timeout: 1200
-
-general:
-  artifacts:
-    - build/reports
-
-deployment:
-  release:
-    tag: /[0-9]+(\.[0-9]+)+/
-    commands:
-      - ./gradlew -i bintrayUpload