Adds description labels and fixes Docker Hub build (#47)

This adds better metadata to the image instead of comments.

This also fixes the incorrectly named hook used by automated DockerHub builds.

docker/Dockerfile

@@ -34,8 +34,10 @@ RUN cd /code/$target && mvn -q --batch-mode -DskipTests package && \
     cp -p /code/docker/bin/docker-healthcheck . && \
     cp -p /code/docker/bin/start-${platform}-example start-brave-example
 
-## Spring WebMVC 2.5/Servlet 2.5/Jetty 7/Java 6 example
 FROM azul/zulu-openjdk-alpine:6u119-6.22.0.3 as webmvc25-jetty
+LABEL description="Tracing Example: Spring WebMVC 2.5/Servlet 2.5/Jetty 7/Java 6"
+# Adding maintainer label as we are using a 3rd party base layer
+LABEL maintainer="OpenZipkin https://zipkin.io/"
 
 WORKDIR /brave-example
 COPY --from=install /install/webmvc25-jetty/ .
@@ -51,8 +53,8 @@ ENTRYPOINT ["start-brave-example"]
 # We use start period of 30s to avoid marking the container unhealthy on slow or contended CI hosts
 HEALTHCHECK --interval=1s --start-period=30s --timeout=5s CMD ["docker-healthcheck"]
 
-## Spring WebMVC 3/Servlet 3.0/Jetty 8/Java 7 example
 FROM openzipkin/java:1.7.0_261-b02-jre as webmvc3-jetty
+LABEL description="Tracing Example: Spring WebMVC 3/Servlet 3.0/Jetty 8/Java 7"
 
 WORKDIR /brave-example
 COPY --from=install /install/webmvc3-jetty/ .
@@ -68,8 +70,8 @@ ENTRYPOINT ["start-brave-example"]
 # We use start period of 30s to avoid marking the container unhealthy on slow or contended CI hosts
 HEALTHCHECK --interval=1s --start-period=30s --timeout=5s CMD ["docker-healthcheck"]
 
-## Spring WebMVC 4/Servlet 3.1/Jetty 9/Java 8 example
 FROM openzipkin/java:1.8.0_252-b09-jre as webmvc4-jetty
+LABEL description="Tracing Example: Spring WebMVC 4/Servlet 3.1/Jetty 9/Java 8"
 
 WORKDIR /brave-example
 COPY --from=install /install/webmvc4-jetty/ .
@@ -85,8 +87,8 @@ ENTRYPOINT ["start-brave-example"]
 # We use start period of 30s to avoid marking the container unhealthy on slow or contended CI hosts
 HEALTHCHECK --interval=1s --start-period=30s --timeout=5s CMD ["docker-healthcheck"]
 
-## Spring WebMVC 4/Spring Boot 1.5/Java 8 example
 FROM openzipkin/java:1.8.0_252-b09-jre as webmvc4-boot
+LABEL description="Tracing Example: Spring WebMVC 4/Spring Boot 1.5/Java 8"
 
 WORKDIR /brave-example
 COPY --from=install /install/webmvc4-boot/ .

docker/hooks/post_push → docker/hooks/push

@@ -1,5 +1,6 @@
 #!/bin/sh -v
 
+# Override push to avoid pushing a latest tag. We use tags for each example.
 if [ "$DOCKER_REPO" = "index.docker.io/openzipkin/example-brave" ]; then
   ALL_EXAMPLES=$(cd ../; ls */pom.xml|sed 's~/pom.xml~~g')
 

webmvc25-jetty/README.md

@@ -1,4 +1,4 @@
-## Brave Example: Spring WebMVC 2.5/Servlet 2.5/Jetty 7
+## Tracing Example: Spring WebMVC 2.5/Servlet 2.5/Jetty 7
 
 ### spring-webmvc-servlet.xml
 

webmvc25-jetty/pom.xml

@@ -9,7 +9,7 @@
   <packaging>war</packaging>
 
   <name>brave-example-webmvc25-jetty</name>
-  <description>Brave Example: Spring WebMVC 2.5/Servlet 2.5/Jetty 7</description>
+  <description>Tracing Example: Spring WebMVC 2.5/Servlet 2.5/Jetty 7</description>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

webmvc3-jetty/README.md

@@ -1,4 +1,4 @@
-## Brave Example: Spring WebMVC 3/Servlet 3.0/Jetty 8
+## Tracing Example: Spring WebMVC 3/Servlet 3.0/Jetty 8
 
 ### spring-webmvc-servlet.xml
 

webmvc3-jetty/pom.xml

@@ -9,7 +9,7 @@
   <packaging>war</packaging>
 
   <name>brave-example-webmvc3-jetty</name>
-  <description>Brave Example: Spring WebMVC 3/Servlet 3.0/Jetty 8</description>
+  <description>Tracing Example: Spring WebMVC 3/Servlet 3.0/Jetty 8</description>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

webmvc4-boot/README.md

@@ -1,4 +1,4 @@
-## Brave Example: Spring WebMVC 4/Spring Boot 1.5
+## Tracing Example: Spring WebMVC 4/Spring Boot 1.5
 
 Instead of servlet, this uses Spring Boot 1.5 to create a self-contained
 application that runs Spring WebMVC 4 controllers.

webmvc4-boot/pom.xml

@@ -9,7 +9,7 @@
   <packaging>jar</packaging>
 
   <name>brave-example-webmvc4-boot</name>
-  <description>Brave Example: Spring WebMVC 4/Spring Boot 1.5</description>
+  <description>Tracing Example: Spring WebMVC 4/Spring Boot 1.5</description>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

webmvc4-jetty/README.md

@@ -1,4 +1,4 @@
-## Brave Example: Spring WebMVC 4/Servlet 3.1/Jetty 9
+## Tracing Example: Spring WebMVC 4/Servlet 3.1/Jetty 9
 
 ### ExampleInitializer
 

webmvc4-jetty/pom.xml

@@ -9,7 +9,7 @@
   <packaging>war</packaging>
 
   <name>brave-example-webmvc4-jetty</name>
-  <description>Brave Example: Spring WebMVC 4/Servlet 3.1/Jetty 9</description>
+  <description>Tracing Example: Spring WebMVC 4/Servlet 3.1/Jetty 9</description>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>