Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop:
  feat(*) : Prepare release.
  fix(info) : Filter info in properties.
  chore(README) : Add documentation.
  • Loading branch information
Maxime Wojtczak committed May 28, 2017
2 parents 24e3f91 + 80bf053 commit 747df0d
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM openjdk:8-jre-alpine
MAINTAINER Maxime Wojtczak <maxime.wojtczak@zenika.com>

ENV PROJECT healthcheck
ENV VERSION 0.2.0
ENV VERSION 0.2.1

COPY target/$PROJECT-$VERSION.jar /healthcheck.jar

Expand Down
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,17 @@

A dummy project implementing a health check for testing purposes.

## Run
docker pull maxwo/healthcheck
docker run -p 8080:8080 maxwo/healthcheck

## Get healthcheck state
curl http://127.0.0.1:8080/healthcheck

## Set healthcheck state
curl -X PUT -H 'Content-type: application/json' -d 'true' http://127.0.0.1:8080/healthcheck

## Healthcheck endpoint
curl http://127.0.0.1:8080/health

It should return a 200 OK status when healthy, otherwise, 503.
13 changes: 12 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>io.github.maxwo</groupId>
<artifactId>healthcheck</artifactId>
<version>0.2.0</version>
<version>0.2.1</version>
<packaging>jar</packaging>

<parent>
Expand Down Expand Up @@ -99,6 +99,17 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
</plugin>
</plugins>
<resources>
<resource>
<directory>${project.basedir}/src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>

</build>
</project>
4 changes: 2 additions & 2 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
spring.main.banner-mode=off

# Application informations
info.app.name=${project.artifactId}
info.app.version=${project.version}
info.app.name=@project.artifactId@
info.app.version=@project.version@

0 comments on commit 747df0d

Please sign in to comment.