diff --git a/Dockerfile b/Dockerfile index 0e04922..7be4192 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,9 @@ -FROM dockerfile/java:oracle-java8 +FROM openjdk:8-alpine ENV MAVEN_VERSION 3.2.5 -RUN curl -sSL http://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz | tar xzf - -C /usr/share \ +RUN apk --update add curl \ + && curl -sSL http://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz | tar xzf - -C /usr/share \ && mv /usr/share/apache-maven-$MAVEN_VERSION /usr/share/maven \ && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn diff --git a/pom.xml b/pom.xml index 1ffcbb0..844d10a 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.springframework.boot spring-boot-starter-parent - 1.2.2.RELEASE + 1.4.2.RELEASE @@ -61,4 +61,4 @@ - \ No newline at end of file + diff --git a/src/test/java/com/gazgeek/helloworld/HealthTest.java b/src/test/java/com/gazgeek/helloworld/HealthTest.java index 75f73b2..b58c2be 100644 --- a/src/test/java/com/gazgeek/helloworld/HealthTest.java +++ b/src/test/java/com/gazgeek/helloworld/HealthTest.java @@ -15,7 +15,9 @@ import java.net.URI; import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.Matchers.contains; import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; import static org.springframework.http.HttpStatus.OK; @RunWith(SpringJUnit4ClassRunner.class) @@ -31,9 +33,9 @@ public class HealthTest { @Test public void checkHealth() { - getRequest("/health") - .assertStatusCode(OK) - .assertResponseBody("{\"status\":\"UP\"}"); + HealthResponse r = getRequest("/health"); + r.assertStatusCode(OK); + assertTrue(r.responseEntity.getBody().contains("\"status\":\"UP\"")); }