From 5ec21fc0bab5c41855e3426d84a00206cf745c71 Mon Sep 17 00:00:00 2001 From: Benjamin Date: Tue, 2 May 2017 21:29:17 +0200 Subject: [PATCH] change deprecated maintainer to label --- elasticsearch/Dockerfile | 2 +- gitblit/Dockerfile | 18 +++++++++--------- gvm/Dockerfile | 2 +- jekyll-github-pages/Dockerfile | 3 +-- jenkins/Dockerfile | 2 +- kibana/Dockerfile | 2 +- logstash/Dockerfile | 2 +- minecraft-server/Dockerfile | 2 +- spring-boot/Dockerfile | 2 +- titan-gremlin/Dockerfile | 2 +- titandb/Dockerfile | 2 +- ubuntu-openjdk-7/Dockerfile | 2 +- 12 files changed, 20 insertions(+), 21 deletions(-) diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index ae12733c..7f0dd4f9 100755 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -1,6 +1,6 @@ FROM openjdk:8u121-jre-alpine -MAINTAINER itzg +LABEL maintainer "itzg" RUN apk -U add bash diff --git a/gitblit/Dockerfile b/gitblit/Dockerfile index 7cb80fe9..5550a0f9 100644 --- a/gitblit/Dockerfile +++ b/gitblit/Dockerfile @@ -1,18 +1,18 @@ FROM java:8 - -MAINTAINER itzg + +LABEL maintainer "itzg" ENV GITBLIT_VERSION 1.7.1 - + RUN wget -qO /tmp/gitblit.tgz http://dl.bintray.com/gitblit/releases/gitblit-$GITBLIT_VERSION.tar.gz - + RUN tar -C /opt -xvf /tmp/gitblit.tgz && \ rm /tmp/gitblit.tgz - + VOLUME ["/data"] - + ADD start.sh /start - + ENV GITBLIT_PATH=/opt/gitblit-${GITBLIT_VERSION} \ GITBLIT_HTTPS_PORT=443 \ GITBLIT_HTTP_PORT=80 \ @@ -20,7 +20,7 @@ ENV GITBLIT_PATH=/opt/gitblit-${GITBLIT_VERSION} \ GITBLIT_ADMIN_USER=admin \ GITBLIT_INITIAL_REPO= WORKDIR $GITBLIT_PATH - + EXPOSE 80 443 - + ENTRYPOINT ["/start"] diff --git a/gvm/Dockerfile b/gvm/Dockerfile index 331c573c..0ec90281 100644 --- a/gvm/Dockerfile +++ b/gvm/Dockerfile @@ -1,6 +1,6 @@ FROM itzg/ubuntu-openjdk-7 -MAINTAINER itzg +LABEL maintainer "itzg" RUN apt-get install -y curl unzip diff --git a/jekyll-github-pages/Dockerfile b/jekyll-github-pages/Dockerfile index eebfadfa..e767f9a3 100644 --- a/jekyll-github-pages/Dockerfile +++ b/jekyll-github-pages/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:trusty -MAINTAINER itzg +LABEL maintainer "itzg" ENV APT_GET_UPDATE 2014-09-18 @@ -21,4 +21,3 @@ EXPOSE 4000 ADD start.sh /start CMD ["/start"] - diff --git a/jenkins/Dockerfile b/jenkins/Dockerfile index a1c7b1a0..e13edbfc 100644 --- a/jenkins/Dockerfile +++ b/jenkins/Dockerfile @@ -1,6 +1,6 @@ FROM java:openjdk-8u102-jdk -MAINTAINER itzg +LABEL maintainer "itzg" RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y \ diff --git a/kibana/Dockerfile b/kibana/Dockerfile index 7f02dd9c..ef617439 100755 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -1,6 +1,6 @@ FROM openjdk:8u111-jre -MAINTAINER itzg +LABEL maintainer "itzg" ENV KIBANA_VERSION 5.1.2 diff --git a/logstash/Dockerfile b/logstash/Dockerfile index ec80dcf0..8742f384 100755 --- a/logstash/Dockerfile +++ b/logstash/Dockerfile @@ -1,6 +1,6 @@ FROM itzg/ubuntu-openjdk-7 -MAINTAINER itzg +LABEL maintainer "itzg" ENV LOGSTASH_VERSION 1.5.0-1 diff --git a/minecraft-server/Dockerfile b/minecraft-server/Dockerfile index c9ffa118..5110f8bc 100644 --- a/minecraft-server/Dockerfile +++ b/minecraft-server/Dockerfile @@ -1,7 +1,7 @@ FROM alpine -MAINTAINER itzg +LABEL maintainer "itzg" RUN echo "http://dl-3.alpinelinux.org/alpine/v3.5/community/" >> /etc/apk/repositories &&\ apk update && \ diff --git a/spring-boot/Dockerfile b/spring-boot/Dockerfile index fb1a117a..9966bd1a 100644 --- a/spring-boot/Dockerfile +++ b/spring-boot/Dockerfile @@ -1,6 +1,6 @@ FROM itzg/gvm -MAINTAINER itzg +LABEL maintainer "itzg" RUN ["/run", "install", "springboot"] diff --git a/titan-gremlin/Dockerfile b/titan-gremlin/Dockerfile index b1c28156..89a7926f 100755 --- a/titan-gremlin/Dockerfile +++ b/titan-gremlin/Dockerfile @@ -1,6 +1,6 @@ FROM itzg/ubuntu-openjdk-7 -MAINTAINER itzg +LABEL maintainer "itzg" ENV TITAN_VERSION 0.5.4 diff --git a/titandb/Dockerfile b/titandb/Dockerfile index 1c603dfb..cf157762 100644 --- a/titandb/Dockerfile +++ b/titandb/Dockerfile @@ -1,6 +1,6 @@ FROM itzg/ubuntu-openjdk-7 -MAINTAINER itzg +LABEL maintainer "itzg" ENV APT_GET_UPDATE 2014-07-19 diff --git a/ubuntu-openjdk-7/Dockerfile b/ubuntu-openjdk-7/Dockerfile index 60e244a3..f0088450 100755 --- a/ubuntu-openjdk-7/Dockerfile +++ b/ubuntu-openjdk-7/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:trusty -MAINTAINER itzg +LABEL maintainer "itzg" ENV APT_GET_UPDATE 2015-10-29 RUN apt-get update