Add org.opencontainers.image.* labels to Dockerfiles

- This should ultimately help for image-to-code back references.
- `org.label-schema.*` labels are now deprecated, in favour of `org.opencontainers.image.*` labels.
  See also: https://github.com/opencontainers/image-spec/blob/master/annotations.md#back-compatibility-with-label-schema
- `MAINTAINER` is deprecated, in favour of the `maintainer` label.
- Git revision is now injected at `docker build` time.

Makefile

@@ -40,7 +40,7 @@ docker/Dockerfile.service: docker/Dockerfile.service.in Makefile
 build/.%.done: docker/Dockerfile.%
 	mkdir -p ./build/docker/$*
 	cp -r $^ ./build/docker/$*/
-	${DOCKER} build -t quay.io/weaveworks/launcher-$* -t quay.io/weaveworks/launcher-$*:$(IMAGE_TAG) -f build/docker/$*/Dockerfile.$* ./build/docker/$*
+	${DOCKER} build --build-arg=revision=$(GIT_HASH) -t quay.io/weaveworks/launcher-$* -t quay.io/weaveworks/launcher-$*:$(IMAGE_TAG) -f build/docker/$*/Dockerfile.$* ./build/docker/$*
 	touch $@
 
 #

docker/Dockerfile.agent

@@ -1,7 +1,13 @@
 FROM alpine:3.7
-LABEL maintainer="Weaveworks Inc <[email protected]>"
 RUN apk add --no-cache ca-certificates
 COPY ./agent /usr/bin/launcher-agent
 COPY ./kubectl /usr/bin/kubectl
 ENTRYPOINT ["/usr/bin/launcher-agent"]
 CMD ["-help"]
+
+ARG revision
+LABEL maintainer="Weaveworks <[email protected]>" \
+      org.opencontainers.image.title="launcher-agent" \
+      org.opencontainers.image.source="https://github.com/weaveworks/launcher" \
+      org.opencontainers.image.revision="${revision}" \
+      org.opencontainers.image.vendor="Weaveworks"

docker/Dockerfile.service.in

@@ -1,9 +1,15 @@
 FROM alpine:3.7
-MAINTAINER Weaveworks Inc <[email protected]>
 WORKDIR /
 COPY service /launcher-service
 RUN mkdir static
 COPY static/install.sh /static/
 COPY static/agent.yaml /static/
 EXPOSE 80
 ENTRYPOINT ["/launcher-service", "--bootstrap-version=@@GIT_HASH@@"]
+
+ARG revision
+LABEL maintainer="Weaveworks <[email protected]>" \
+      org.opencontainers.image.title="launcher-service" \
+      org.opencontainers.image.source="https://github.com/weaveworks/launcher" \
+      org.opencontainers.image.revision="${revision}" \
+      org.opencontainers.image.vendor="Weaveworks"

integration-tests/docker/Dockerfile.nginx-bootstrap

@@ -2,4 +2,10 @@ FROM nginx
 EXPOSE 80
 ARG version
 RUN mkdir -p /usr/share/nginx/html/bootstrap/${version}
-COPY ./bootstrap/* /usr/share/nginx/html/bootstrap/${version}/
+COPY ./bootstrap/* /usr/share/nginx/html/bootstrap/${version}/
+
+LABEL maintainer="Weaveworks <[email protected]>" \
+      org.opencontainers.image.title="launcher-integration-tests" \
+      org.opencontainers.image.source="https://github.com/weaveworks/launcher/tree/master/integration-tests" \
+      org.opencontainers.image.revision="${version}" \
+      org.opencontainers.image.vendor="Weaveworks"