MAINTAINER is deprecated, using LABEL now (#383)

* MAINTAINER is deprecated, using LABEL now

* converted maintainer to comments

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index 47bb9772a6b6f21e951a77196aad26261eeefda0..3d99e0ca7e65c4cd5c416e2ead0232669436a5d5 100644 (file)
--- 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 97f0bf0c8105654c572fc6dcb29b87d765c322a8..432b59d738ef91905e522056dbd45e9cd3644bd5 100644 (file)
--- 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 <mail@gerhard-schlager.at>
+#LABEL maintainer="Gerhard Schlager <mail@gerhard-schlager.at>"
 
 # Install ApacheBench
 RUN apt-get install -y apache2-utils libsqlite3-dev

diff --git a/image/discourse_dev/Dockerfile b/image/discourse_dev/Dockerfile
index 8e106da1023d23b31bbb49eb9fdcd447a61cfd8f..8b1886e96b10cbc5e1f16a17ba461f4419d1bfb6 100644 (file)
--- 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 e061a8614765a09fd7e46fcaf90559f030149410..e99466f41b4021d458255224a71cb4b9a4107d5c 100644 (file)
--- 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 794d9fc8a2b6f1ce060da8490b6cdc21e1d4456d..fd97a45f12d3557b1a9cfbcaf72c4eb7ae306fde 100644 (file)
--- 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