Merge pull request #650 from yankay/fix-deprecated-maintainer-in-dockerfile

k8s-ci-robot · web-flow · commit 9c23553e0bd0 · 2022-04-21T12:28:12.000-07:00
FIx deprecated "MAINTAINER" in Dockerfile
diff --git a/Dockerfile b/Dockerfile
@@ -15,7 +15,7 @@
 ARG BASEIMAGE
 FROM ${BASEIMAGE}
 
-MAINTAINER Random Liu <lantaol@google.com>
+LABEL maintainer="Random Liu <lantaol@google.com>"
 
 RUN clean-install util-linux libsystemd0 bash
 
diff --git a/pkg/util/nethealth/Dockerfile b/pkg/util/nethealth/Dockerfile
@@ -13,6 +13,6 @@
 # limitations under the License.
 
 FROM busybox
-MAINTAINER Girish Kalele <gkalele@google.com>
+LABEL maintainer="Girish Kalele <gkalele@google.com>"
 COPY nethealth /usr/bin/
 ENTRYPOINT ["/usr/bin/nethealth"]
diff --git a/test/kernel_log_generator/Dockerfile b/test/kernel_log_generator/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 FROM bashell/alpine-bash
-MAINTAINER Random Liu <lantaol@google.com>
+LABEL maintainer="Random Liu <lantaol@google.com>"
 
 # Use oom kill problem as default
 ENV PROBLEM /problems/oom_kill

-Original file line number
+Diff line change
 ARG BASEIMAGE
 FROM ${BASEIMAGE}
 -MAINTAINER Random Liu <[email protected]>
 +LABEL maintainer="Random Liu <[email protected]>"
 RUN clean-install util-linux libsystemd0 bash