From f8edb88397925635d3927f79ef909ac2dc741ea1 Mon Sep 17 00:00:00 2001 From: "Tobias L. Maier" Date: Sun, 29 Apr 2018 06:06:00 +0200 Subject: [PATCH] Replace MAINTAINER with LABEL Based on OCI annotation spec https://github.com/opencontainers/image-spec/blob/master/annotations.md --- 1.12/Dockerfile | 9 ++++++++- 1.13/Dockerfile | 9 ++++++++- 17.03/Dockerfile | 9 ++++++++- 17.06/Dockerfile | 9 ++++++++- 17.09/Dockerfile | 9 ++++++++- 17.12/Dockerfile | 9 ++++++++- 17/Dockerfile | 9 ++++++++- 18.02/Dockerfile | 9 ++++++++- 18/Dockerfile | 9 ++++++++- latest/Dockerfile | 9 ++++++++- 10 files changed, 80 insertions(+), 10 deletions(-) diff --git a/1.12/Dockerfile b/1.12/Dockerfile index e53ef2f..2473d88 100644 --- a/1.12/Dockerfile +++ b/1.12/Dockerfile @@ -1,8 +1,15 @@ ARG DOCKER_VERSION=1.12 FROM docker:${DOCKER_VERSION} -MAINTAINER Tobias Maier ARG COMPOSE_VERSION=1.8.* RUN apk add --no-cache py-pip RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" + +LABEL \ + org.opencontainers.image.authors="Tobias Maier " \ + org.opencontainers.image.description="This docker image installs docker-compose on top of the docker image." \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.source="https://github.com/tmaier/docker-compose" \ + org.opencontainers.image.title="Docker Compose on docker base image" \ + org.opencontainers.image.vendor="BauCloud GmbH" diff --git a/1.13/Dockerfile b/1.13/Dockerfile index f081882..6f27ddb 100644 --- a/1.13/Dockerfile +++ b/1.13/Dockerfile @@ -1,8 +1,15 @@ ARG DOCKER_VERSION=1.13 FROM docker:${DOCKER_VERSION} -MAINTAINER Tobias Maier ARG COMPOSE_VERSION=1.10.* RUN apk add --no-cache py-pip RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" + +LABEL \ + org.opencontainers.image.authors="Tobias Maier " \ + org.opencontainers.image.description="This docker image installs docker-compose on top of the docker image." \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.source="https://github.com/tmaier/docker-compose" \ + org.opencontainers.image.title="Docker Compose on docker base image" \ + org.opencontainers.image.vendor="BauCloud GmbH" diff --git a/17.03/Dockerfile b/17.03/Dockerfile index 445a87a..ffa2f1f 100644 --- a/17.03/Dockerfile +++ b/17.03/Dockerfile @@ -1,8 +1,15 @@ ARG DOCKER_VERSION=17.03 FROM docker:${DOCKER_VERSION} -MAINTAINER Tobias Maier ARG COMPOSE_VERSION=1.11.* RUN apk add --no-cache py-pip RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" + +LABEL \ + org.opencontainers.image.authors="Tobias Maier " \ + org.opencontainers.image.description="This docker image installs docker-compose on top of the docker image." \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.source="https://github.com/tmaier/docker-compose" \ + org.opencontainers.image.title="Docker Compose on docker base image" \ + org.opencontainers.image.vendor="BauCloud GmbH" diff --git a/17.06/Dockerfile b/17.06/Dockerfile index e14ec2c..5b4ebfd 100644 --- a/17.06/Dockerfile +++ b/17.06/Dockerfile @@ -1,8 +1,15 @@ ARG DOCKER_VERSION=17.06 FROM docker:${DOCKER_VERSION} -MAINTAINER Tobias Maier ARG COMPOSE_VERSION=1.15.* RUN apk add --no-cache py-pip RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" + +LABEL \ + org.opencontainers.image.authors="Tobias Maier " \ + org.opencontainers.image.description="This docker image installs docker-compose on top of the docker image." \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.source="https://github.com/tmaier/docker-compose" \ + org.opencontainers.image.title="Docker Compose on docker base image" \ + org.opencontainers.image.vendor="BauCloud GmbH" diff --git a/17.09/Dockerfile b/17.09/Dockerfile index 656238a..5622b24 100644 --- a/17.09/Dockerfile +++ b/17.09/Dockerfile @@ -1,8 +1,15 @@ ARG DOCKER_VERSION=17.09 FROM docker:${DOCKER_VERSION} -MAINTAINER Tobias Maier ARG COMPOSE_VERSION=1.16.* RUN apk add --no-cache py-pip RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" + +LABEL \ + org.opencontainers.image.authors="Tobias Maier " \ + org.opencontainers.image.description="This docker image installs docker-compose on top of the docker image." \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.source="https://github.com/tmaier/docker-compose" \ + org.opencontainers.image.title="Docker Compose on docker base image" \ + org.opencontainers.image.vendor="BauCloud GmbH" diff --git a/17.12/Dockerfile b/17.12/Dockerfile index c67b9fd..ebd0ae6 100644 --- a/17.12/Dockerfile +++ b/17.12/Dockerfile @@ -1,8 +1,15 @@ ARG DOCKER_VERSION=17.12 FROM docker:${DOCKER_VERSION} -MAINTAINER Tobias Maier ARG COMPOSE_VERSION=1.18.* RUN apk add --no-cache py-pip RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" + +LABEL \ + org.opencontainers.image.authors="Tobias Maier " \ + org.opencontainers.image.description="This docker image installs docker-compose on top of the docker image." \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.source="https://github.com/tmaier/docker-compose" \ + org.opencontainers.image.title="Docker Compose on docker base image" \ + org.opencontainers.image.vendor="BauCloud GmbH" diff --git a/17/Dockerfile b/17/Dockerfile index 75d18a9..f8f1ce6 100644 --- a/17/Dockerfile +++ b/17/Dockerfile @@ -1,8 +1,15 @@ ARG DOCKER_VERSION=17 FROM docker:${DOCKER_VERSION} -MAINTAINER Tobias Maier ARG COMPOSE_VERSION=1.18.* RUN apk add --no-cache py-pip RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" + +LABEL \ + org.opencontainers.image.authors="Tobias Maier " \ + org.opencontainers.image.description="This docker image installs docker-compose on top of the docker image." \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.source="https://github.com/tmaier/docker-compose" \ + org.opencontainers.image.title="Docker Compose on docker base image" \ + org.opencontainers.image.vendor="BauCloud GmbH" diff --git a/18.02/Dockerfile b/18.02/Dockerfile index abd1481..1f0e931 100644 --- a/18.02/Dockerfile +++ b/18.02/Dockerfile @@ -1,8 +1,15 @@ ARG DOCKER_VERSION=18.02 FROM docker:${DOCKER_VERSION} -MAINTAINER Tobias Maier ARG COMPOSE_VERSION=1.19.* RUN apk add --no-cache py-pip RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" + +LABEL \ + org.opencontainers.image.authors="Tobias Maier " \ + org.opencontainers.image.description="This docker image installs docker-compose on top of the docker image." \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.source="https://github.com/tmaier/docker-compose" \ + org.opencontainers.image.title="Docker Compose on docker base image" \ + org.opencontainers.image.vendor="BauCloud GmbH" diff --git a/18/Dockerfile b/18/Dockerfile index 074d225..feae578 100644 --- a/18/Dockerfile +++ b/18/Dockerfile @@ -1,8 +1,15 @@ ARG DOCKER_VERSION=18 FROM docker:${DOCKER_VERSION} -MAINTAINER Tobias Maier ARG COMPOSE_VERSION=1.19.* RUN apk add --no-cache py-pip RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" + +LABEL \ + org.opencontainers.image.authors="Tobias Maier " \ + org.opencontainers.image.description="This docker image installs docker-compose on top of the docker image." \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.source="https://github.com/tmaier/docker-compose" \ + org.opencontainers.image.title="Docker Compose on docker base image" \ + org.opencontainers.image.vendor="BauCloud GmbH" diff --git a/latest/Dockerfile b/latest/Dockerfile index f2b6edf..0e1fa0f 100644 --- a/latest/Dockerfile +++ b/latest/Dockerfile @@ -1,8 +1,15 @@ ARG DOCKER_VERSION=latest FROM docker:${DOCKER_VERSION} -MAINTAINER Tobias Maier ARG COMPOSE_VERSION= RUN apk add --no-cache py-pip RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" + +LABEL \ + org.opencontainers.image.authors="Tobias Maier " \ + org.opencontainers.image.description="This docker image installs docker-compose on top of the docker image." \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.source="https://github.com/tmaier/docker-compose" \ + org.opencontainers.image.title="Docker Compose on docker base image" \ + org.opencontainers.image.vendor="BauCloud GmbH"