laforge submitted this change.

View Change

Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved 
*/Dockerfile: drop MAINTAINER line

MAINTAINER is deprecated, drop the line in all Dockerfiles as suggested
by Vadim.

Related: https://docs.docker.com/engine/reference/builder/#maintainer-deprecated
Change-Id: If1ef3032af2075d792c526ae744ec4c0c091da3a
---
M alpine-build/Dockerfile
M alpine-lighttpd/Dockerfile
M arm-none-eabi-gcc-4.8.2/Dockerfile
M debian-bullseye-erlang/Dockerfile
M debian-bullseye-titan/Dockerfile
M debian-buster-simtrace2/Dockerfile
M debian-jessie-build/Dockerfile
M debian-jessie-buildslave/Dockerfile
M debian-jessie-osmocom/Dockerfile
M debian-sid-build/Dockerfile
M fpga-build/Dockerfile
M git-daemon/Dockerfile
M gr-gsm-master/Dockerfile
M nplab-m3ua-test/Dockerfile
M nplab-sua-test/Dockerfile
M open5gs-latest/Dockerfile
M open5gs-master/Dockerfile
M openbts-umts/Dockerfile
M osmo-dev-on-debian-sid/Dockerfile
M osmo-gerrit-libosmo/Dockerfile
M osmo-gsm-tester/Dockerfile
M osmo-ran/Dockerfile
M osmo-ran/split/ran-bsc_mgw/Dockerfile
M osmo-ran/split/ran-bts_pcu/Dockerfile
M osmo-ran/split/ran-trx-ipc/Dockerfile
M osmo-ran/split/ran-trx-uhd/Dockerfile
M sctp-test/Dockerfile
M sigtran-tests/Dockerfile
M systemd/Dockerfile
M ubuntu-zesty-build/Dockerfile
30 files changed, 0 insertions(+), 30 deletions(-)

diff --git a/alpine-build/Dockerfile b/alpine-build/Dockerfile
index 26b8d29..f115842 100644
--- a/alpine-build/Dockerfile
+++ b/alpine-build/Dockerfile
@@ -1,7 +1,6 @@
 ARG	REGISTRY=docker.io
 FROM	${REGISTRY}/alpine:3.6
 
-MAINTAINER Harald Welte <laforge@gnumonks.org>
 
 RUN	apk update && \
 	apk upgrade
diff --git a/alpine-lighttpd/Dockerfile b/alpine-lighttpd/Dockerfile
index f693e8a..6029a8e 100644
--- a/alpine-lighttpd/Dockerfile
+++ b/alpine-lighttpd/Dockerfile
@@ -1,5 +1,4 @@
 FROM		alpine:latest
-MAINTAINER 	Harald Welte <laforge@gnumonks.org>
 
 EXPOSE		80
 
diff --git a/arm-none-eabi-gcc-4.8.2/Dockerfile b/arm-none-eabi-gcc-4.8.2/Dockerfile
index 6c1373c..3016e73 100644
--- a/arm-none-eabi-gcc-4.8.2/Dockerfile
+++ b/arm-none-eabi-gcc-4.8.2/Dockerfile
@@ -1,6 +1,5 @@
 FROM 	debian:stretch
 
-MAINTAINER Vadim Yanitskiy <axilirator@gmail.com>
 
 ENV	BINUTILS_SRC=http://ftp.gnu.org/gnu/binutils/binutils-2.21.1a.tar.bz2
 ENV	NEWLIB_SRC=https://sourceware.org/pub/newlib/newlib-1.19.0.tar.gz
diff --git a/debian-bullseye-erlang/Dockerfile b/debian-bullseye-erlang/Dockerfile
index 15da137..aeff1c7 100644
--- a/debian-bullseye-erlang/Dockerfile
+++ b/debian-bullseye-erlang/Dockerfile
@@ -4,7 +4,6 @@
 ARG	OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
 ARG	OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
 
-MAINTAINER Harald Welte <laforge@gnumonks.org>
 
 ARG	OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/Debian_11/"
 
diff --git a/debian-bullseye-titan/Dockerfile b/debian-bullseye-titan/Dockerfile
index 16b25b9..5ee3a06 100644
--- a/debian-bullseye-titan/Dockerfile
+++ b/debian-bullseye-titan/Dockerfile
@@ -4,7 +4,6 @@
 # Arguments used after FROM must be specified again
 ARG	OSMOCOM_REPO_TESTSUITE_MIRROR="http://download.opensuse.org"
 
-MAINTAINER Harald Welte <laforge@gnumonks.org>
 
 ARG	OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/repositories/network:/osmocom:/latest/Debian_11/"
 
diff --git a/debian-buster-simtrace2/Dockerfile b/debian-buster-simtrace2/Dockerfile
index a8765b9..71309b5 100644
--- a/debian-buster-simtrace2/Dockerfile
+++ b/debian-buster-simtrace2/Dockerfile
@@ -4,7 +4,6 @@
 ARG	OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
 ARG	OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
 
-MAINTAINER Harald Welte <laforge@gnumonks.org>
 
 ARG	OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/nightly/Debian_10/"
 
diff --git a/debian-jessie-build/Dockerfile b/debian-jessie-build/Dockerfile
index 141d258..e101a13 100644
--- a/debian-jessie-build/Dockerfile
+++ b/debian-jessie-build/Dockerfile
@@ -1,7 +1,6 @@
 ARG	REGISTRY=docker.io
 FROM	${REGISTRY}/debian:jessie
 
-MAINTAINER Harald Welte <laforge@gnumonks.org>
 
 RUN	apt-get update && \
 	apt-get upgrade -y && \
diff --git a/debian-jessie-buildslave/Dockerfile b/debian-jessie-buildslave/Dockerfile
index 98d70a9..a00fc47 100644
--- a/debian-jessie-buildslave/Dockerfile
+++ b/debian-jessie-buildslave/Dockerfile
@@ -1,7 +1,6 @@
 ARG	USER
 FROM	$USER/debian-jessie-build
 
-MAINTAINER Harald Welte <laforge@gnumonks.org>
 
 RUN	[ "$(arch)" = "x86_64" ] && dpkg --add-architecture i386; \
 	apt-get update && \
diff --git a/debian-jessie-osmocom/Dockerfile b/debian-jessie-osmocom/Dockerfile
index d95e249..08fb320 100644
--- a/debian-jessie-osmocom/Dockerfile
+++ b/debian-jessie-osmocom/Dockerfile
@@ -4,7 +4,6 @@
 ARG	OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
 ARG	OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
 
-MAINTAINER Harald Welte <laforge@gnumonks.org>
 
 ARG	OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/nightly/Debian_8.0/"
 
diff --git a/debian-sid-build/Dockerfile b/debian-sid-build/Dockerfile
index f4fe990..5610833 100644
--- a/debian-sid-build/Dockerfile
+++ b/debian-sid-build/Dockerfile
@@ -1,7 +1,6 @@
 ARG	REGISTRY=docker.io
 FROM	${REGISTRY}/debian:sid
 
-MAINTAINER Harald Welte <laforge@gnumonks.org>
 
 RUN	apt-get update && \
 	apt-get upgrade -y && \
diff --git a/fpga-build/Dockerfile b/fpga-build/Dockerfile
index 135af71..6e975a7 100644
--- a/fpga-build/Dockerfile
+++ b/fpga-build/Dockerfile
@@ -1,7 +1,6 @@
 ARG	USER
 FROM	$USER/debian-buster-build
 
-MAINTAINER Harald Welte <laforge@gnumonks.org>
 
 ARG	FPGA_TOOLCHAIN_DATE=20200914
 ARG	RISCV_TOOLCHAIN_VER=8.3.0-1.2
diff --git a/git-daemon/Dockerfile b/git-daemon/Dockerfile
index 9c4601b..2ddb5a9 100644
--- a/git-daemon/Dockerfile
+++ b/git-daemon/Dockerfile
@@ -1,5 +1,4 @@
 FROM debian:latest
-MAINTAINER laforge@gnumonks.org
 
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/gr-gsm-master/Dockerfile b/gr-gsm-master/Dockerfile
index 5e878c1..f0e4e97 100644
--- a/gr-gsm-master/Dockerfile
+++ b/gr-gsm-master/Dockerfile
@@ -2,7 +2,6 @@
 ARG	USER
 FROM 	$USER/debian-bullseye-build
 
-MAINTAINER Vadim Yanitskiy <axilirator@gmail.com>
 
 RUN	apt-get update && \
 	apt-get install -y --no-install-recommends \
diff --git a/nplab-m3ua-test/Dockerfile b/nplab-m3ua-test/Dockerfile
index db993bd..1a53329 100644
--- a/nplab-m3ua-test/Dockerfile
+++ b/nplab-m3ua-test/Dockerfile
@@ -1,7 +1,6 @@
 ARG USER=osmocom-build
 FROM $USER/sigtran-tests
 
-MAINTAINER Harald Welte <laforge@gnumonks.org>
 
 RUN	cd /tmp && git clone git://git.osmocom.org/nplab/m3ua-testtool
 ADD	http://git.osmocom.org/nplab/m3ua-testtool/patch/?h=laforge/python3 /tmp/commit
diff --git a/nplab-sua-test/Dockerfile b/nplab-sua-test/Dockerfile
index d62f665..931623b 100644
--- a/nplab-sua-test/Dockerfile
+++ b/nplab-sua-test/Dockerfile
@@ -1,7 +1,6 @@
 ARG USER=osmocom-build
 FROM $USER/sigtran-tests
 
-MAINTAINER Harald Welte <laforge@gnumonks.org>
 
 RUN	cd /tmp && git clone git://git.osmocom.org/nplab/sua-testtool
 ADD	http://git.osmocom.org/nplab/sua-testtool/patch/?h=laforge/python3 /tmp/commit
diff --git a/open5gs-latest/Dockerfile b/open5gs-latest/Dockerfile
index 66683b9..e8424de 100644
--- a/open5gs-latest/Dockerfile
+++ b/open5gs-latest/Dockerfile
@@ -1,7 +1,6 @@
 ARG	REGISTRY=docker.io
 FROM	${REGISTRY}/debian:buster
 
-MAINTAINER Vadim Yanitskiy <vyanitskiy@sysmocom.de>
 
 RUN	apt-get update && \
 	apt-get install -y --no-install-recommends \
diff --git a/open5gs-master/Dockerfile b/open5gs-master/Dockerfile
index 0e73559..1aea492 100644
--- a/open5gs-master/Dockerfile
+++ b/open5gs-master/Dockerfile
@@ -2,7 +2,6 @@
 ARG	USER
 FROM	$USER/debian-bullseye-build
 
-MAINTAINER Harald Welte <laforge@gnumonks.org>
 
 RUN apt-get update && \
     apt-get upgrade -y && \
diff --git a/openbts-umts/Dockerfile b/openbts-umts/Dockerfile
index b3fd386..0fee2ff 100644
--- a/openbts-umts/Dockerfile
+++ b/openbts-umts/Dockerfile
@@ -3,7 +3,6 @@
 # Ancient software requires ancient distro
 FROM	debian:jessie
 
-MAINTAINER Vadim Yanitskiy <axilirator@gmail.com>
 
 RUN	apt-get update && \
 	apt-get install -y --no-install-recommends \
diff --git a/osmo-dev-on-debian-sid/Dockerfile b/osmo-dev-on-debian-sid/Dockerfile
index bc65f9c..81ba3cd 100644
--- a/osmo-dev-on-debian-sid/Dockerfile
+++ b/osmo-dev-on-debian-sid/Dockerfile
@@ -1,6 +1,5 @@
 FROM neels/debian-sid-build
 
-MAINTAINER Neels Hofmeyr <nhofmeyr@sysmocom.de>
 
 WORKDIR	/build
 
diff --git a/osmo-gerrit-libosmo/Dockerfile b/osmo-gerrit-libosmo/Dockerfile
index 1b98c9f..1478e75 100644
--- a/osmo-gerrit-libosmo/Dockerfile
+++ b/osmo-gerrit-libosmo/Dockerfile
@@ -6,7 +6,6 @@
 ARG	USER
 FROM	$USER/debian-jessie-buildslave
 
-MAINTAINER Harald Welte <laforge@gnumonks.org>
 
 USER	build
 WORKDIR	/build
diff --git a/osmo-gsm-tester/Dockerfile b/osmo-gsm-tester/Dockerfile
index a584faa..052c565 100644
--- a/osmo-gsm-tester/Dockerfile
+++ b/osmo-gsm-tester/Dockerfile
@@ -2,7 +2,6 @@
 FROM	$USER/debian-buster-jenkins
 ARG	OGT_MASTER_ADDR="172.18.50.2"
 
-MAINTAINER Pau Espin Pedrol <pespin@sysmocom.de>
 
 # Create jenkins user
 RUN     useradd -ms /bin/bash jenkins
diff --git a/osmo-ran/Dockerfile b/osmo-ran/Dockerfile
index 61978ed..64697c6 100644
--- a/osmo-ran/Dockerfile
+++ b/osmo-ran/Dockerfile
@@ -6,7 +6,6 @@
 ARG	OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
 ARG	OSMOCOM_REPO_VERSION=latest
 
-MAINTAINER Pau Espin Pedrol <pespin@sysmocom.de>
 
 ARG	OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/Debian_9.0/"
 ARG	OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/CentOS_8/"
diff --git a/osmo-ran/split/ran-bsc_mgw/Dockerfile b/osmo-ran/split/ran-bsc_mgw/Dockerfile
index 0cf8347..e0e3b15 100644
--- a/osmo-ran/split/ran-bsc_mgw/Dockerfile
+++ b/osmo-ran/split/ran-bsc_mgw/Dockerfile
@@ -6,7 +6,6 @@
 ARG	OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
 ARG	OSMOCOM_REPO_VERSION=latest
 
-MAINTAINER Pau Espin Pedrol <pespin@sysmocom.de>
 
 ARG	OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/Debian_9.0/"
 ARG	OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/CentOS_8/"
diff --git a/osmo-ran/split/ran-bts_pcu/Dockerfile b/osmo-ran/split/ran-bts_pcu/Dockerfile
index e49b8b1..d8b9bcd 100644
--- a/osmo-ran/split/ran-bts_pcu/Dockerfile
+++ b/osmo-ran/split/ran-bts_pcu/Dockerfile
@@ -6,7 +6,6 @@
 ARG	OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
 ARG	OSMOCOM_REPO_VERSION=latest
 
-MAINTAINER Pau Espin Pedrol <pespin@sysmocom.de>
 
 ARG	OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/Debian_9.0/"
 ARG	OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/CentOS_8/"
diff --git a/osmo-ran/split/ran-trx-ipc/Dockerfile b/osmo-ran/split/ran-trx-ipc/Dockerfile
index bcd84cb..e273da9 100644
--- a/osmo-ran/split/ran-trx-ipc/Dockerfile
+++ b/osmo-ran/split/ran-trx-ipc/Dockerfile
@@ -6,7 +6,6 @@
 ARG	OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
 ARG	OSMOCOM_REPO_VERSION=latest
 
-MAINTAINER Pau Espin Pedrol <pespin@sysmocom.de>
 
 ARG	OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/Debian_9.0/"
 ARG	OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/CentOS_8/"
diff --git a/osmo-ran/split/ran-trx-uhd/Dockerfile b/osmo-ran/split/ran-trx-uhd/Dockerfile
index 08baa07..adc764a 100644
--- a/osmo-ran/split/ran-trx-uhd/Dockerfile
+++ b/osmo-ran/split/ran-trx-uhd/Dockerfile
@@ -6,7 +6,6 @@
 ARG	OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
 ARG	OSMOCOM_REPO_VERSION=latest
 
-MAINTAINER Pau Espin Pedrol <pespin@sysmocom.de>
 
 ARG	OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/Debian_9.0/"
 ARG	OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/CentOS_8/"
diff --git a/sctp-test/Dockerfile b/sctp-test/Dockerfile
index 7ba92bf..4015fe6 100644
--- a/sctp-test/Dockerfile
+++ b/sctp-test/Dockerfile
@@ -1,7 +1,6 @@
 ARG	USER
 FROM	$USER/debian-bullseye-build
 
-MAINTAINER Harald Welte <laforge@gnumonks.org>
 
 RUN	apt-get update && \
 	apt-get install -y --no-install-recommends \
diff --git a/sigtran-tests/Dockerfile b/sigtran-tests/Dockerfile
index d7f7206..51cff39 100644
--- a/sigtran-tests/Dockerfile
+++ b/sigtran-tests/Dockerfile
@@ -1,7 +1,6 @@
 ARG	USER
 FROM	$USER/debian-buster-build
 
-MAINTAINER Harald Welte <laforge@gnumonks.org>
 
 RUN	apt-get update && apt-get -y install		\
 		guile-2.0 guile-2.0-dev gnulib tcsh \
diff --git a/systemd/Dockerfile b/systemd/Dockerfile
index 63d4c40..542b38c 100644
--- a/systemd/Dockerfile
+++ b/systemd/Dockerfile
@@ -4,7 +4,6 @@
 # Arguments used after FROM must be specified again
 ARG	DISTRO
 
-MAINTAINER Pau Espin Pedrol <pespin@sysmocom.de>
 
 # set up systemd
 # container=docker: systemd likes to know it is running inside a container
diff --git a/ubuntu-zesty-build/Dockerfile b/ubuntu-zesty-build/Dockerfile
index cfda27f..ee95bd7 100644
--- a/ubuntu-zesty-build/Dockerfile
+++ b/ubuntu-zesty-build/Dockerfile
@@ -1,7 +1,6 @@
 ARG	REGISTRY=docker.io
 FROM	${REGISTRY}/ubuntu:zesty
 
-MAINTAINER Harald Welte <laforge@gnumonks.org>
 
 RUN	apt-get update && \
 	apt-get upgrade -y && \

To view, visit change 28106. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: If1ef3032af2075d792c526ae744ec4c0c091da3a
Gerrit-Change-Number: 28106
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-MessageType: merged