From a00700c1abd415104e8bb60485c3aa324e02167d Mon Sep 17 00:00:00 2001 From: Charlie Lewis Date: Tue, 31 Oct 2017 14:07:21 -0700 Subject: [PATCH] MAINTAINER is deprecated, using LABEL now (#383) * MAINTAINER is deprecated, using LABEL now * converted maintainer to comments --- image/base/Dockerfile | 2 +- image/discourse_bench/Dockerfile | 2 +- image/discourse_dev/Dockerfile | 2 +- image/discourse_fast_switch/Dockerfile | 2 +- image/monitor/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/image/base/Dockerfile b/image/base/Dockerfile index 47bb977..3d99e0c 100644 --- a/image/base/Dockerfile +++ b/image/base/Dockerfile @@ -6,7 +6,7 @@ ENV PG_MAJOR 9.5 ENV RUBY_ALLOCATOR /usr/lib/libjemalloc.so.1 ENV COMPRESS_BROTLI 1 -MAINTAINER Sam Saffron "https://twitter.com/samsaffron" +#LABEL maintainer="Sam Saffron \"https://twitter.com/samsaffron\"" RUN echo 2.0.`date +%Y%m%d` > /VERSION diff --git a/image/discourse_bench/Dockerfile b/image/discourse_bench/Dockerfile index 97f0bf0..432b59d 100644 --- a/image/discourse_bench/Dockerfile +++ b/image/discourse_bench/Dockerfile @@ -2,7 +2,7 @@ # VERSION: 1.4.0 FROM discourse/discourse_test:1.4.0 -MAINTAINER Gerhard Schlager +#LABEL maintainer="Gerhard Schlager " # Install ApacheBench RUN apt-get install -y apache2-utils libsqlite3-dev diff --git a/image/discourse_dev/Dockerfile b/image/discourse_dev/Dockerfile index 8e106da..8b1886e 100644 --- a/image/discourse_dev/Dockerfile +++ b/image/discourse_dev/Dockerfile @@ -2,7 +2,7 @@ # VERSION: release FROM discourse/base:release -MAINTAINER Sam Saffron "https://twitter.com/samsaffron" +#LABEL maintainer="Sam Saffron \"https://twitter.com/samsaffron\"" # Install for mailcatcher gem RUN apt-get update && apt-get install -y libsqlite3-dev \ diff --git a/image/discourse_fast_switch/Dockerfile b/image/discourse_fast_switch/Dockerfile index e061a86..e99466f 100644 --- a/image/discourse_fast_switch/Dockerfile +++ b/image/discourse_fast_switch/Dockerfile @@ -4,7 +4,7 @@ # Allow to easily switch Ruby version in images that derive off this FROM discourse/base:1.4.0 -MAINTAINER Sam Saffron "https://twitter.com/samsaffron" +#LABEL maintainer="Sam Saffron \"https://twitter.com/samsaffron\"" RUN apt-get -y install ruby bison autoconf &&\ echo install_package "openssl-1.0.1l" "https://www.openssl.org/source/openssl-1.0.1l.tar.gz#b2cf4d48fe5d49f240c61c9e624193a6f232b5ed0baf010681e725963c40d1d4" mac_openssl --if has_broken_mac_openssl > /src/2.2.3-github &&\ diff --git a/image/monitor/Dockerfile b/image/monitor/Dockerfile index 794d9fc..fd97a45 100644 --- a/image/monitor/Dockerfile +++ b/image/monitor/Dockerfile @@ -5,7 +5,7 @@ # version 0.0.2 FROM samsaffron/discourse_base:1.0.7 -MAINTAINER Sam Saffron "https://twitter.com/samsaffron" +#LABEL maintainer="Sam Saffron \"https://twitter.com/samsaffron\"" ADD src/monitor.rb src/monitor.rb RUN gem install statsd-ruby docker-api -- 2.25.1