You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by do...@apache.org on 2021/03/16 01:57:45 UTC
[orc] branch branch-1.6 updated: ORC-761: Replace MAINTAINER
command with LABEL command (#656)
This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-1.6
in repository https://gitbox.apache.org/repos/asf/orc.git
The following commit(s) were added to refs/heads/branch-1.6 by this push:
new a533cfc ORC-761: Replace MAINTAINER command with LABEL command (#656)
a533cfc is described below
commit a533cfca2bd8e1aff6336a751bf7acb98deb17e5
Author: Yukihiro Okada <yu...@treasure-data.com>
AuthorDate: Tue Mar 16 10:53:18 2021 +0900
ORC-761: Replace MAINTAINER command with LABEL command (#656)
- Replace MAINTAINER command with LABEL command.
MAINTAINER command is deprecated since docker 1.13 or later.
https://docs.docker.com/engine/reference/builder/#maintainer-deprecated
- Confirmed that `Dockerfile`s are built successfully with `reinit.sh`
(cherry picked from commit 654f777bc34841eed3b340047308f8dac7f554db)
Signed-off-by: Dongjoon Hyun <do...@apache.org>
---
docker/centos7/Dockerfile | 2 +-
docker/centos8/Dockerfile | 2 +-
docker/debian10/Dockerfile | 2 +-
docker/debian8/Dockerfile | 2 +-
docker/debian9/Dockerfile | 2 +-
docker/ubuntu14/Dockerfile | 2 +-
docker/ubuntu16/Dockerfile | 2 +-
docker/ubuntu18/Dockerfile | 4 ++--
docker/ubuntu20-clang/Dockerfile | 4 ++--
docker/ubuntu20/Dockerfile | 4 ++--
10 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/docker/centos7/Dockerfile b/docker/centos7/Dockerfile
index ef2a1bd..82c9cbe 100644
--- a/docker/centos7/Dockerfile
+++ b/docker/centos7/Dockerfile
@@ -18,7 +18,7 @@
#
FROM centos:7
-MAINTAINER Apache ORC project <de...@orc.apache.org>
+LABEL maintainer="Apache ORC project <de...@orc.apache.org>"
RUN yum check-update || true
RUN yum -y install epel-release
diff --git a/docker/centos8/Dockerfile b/docker/centos8/Dockerfile
index 7549d20..3736b31 100644
--- a/docker/centos8/Dockerfile
+++ b/docker/centos8/Dockerfile
@@ -18,7 +18,7 @@
#
FROM centos:8
-MAINTAINER Apache ORC project <de...@orc.apache.org>
+LABEL maintainer="Apache ORC project <de...@orc.apache.org>"
RUN yum check-update || true
RUN yum install -y \
diff --git a/docker/debian10/Dockerfile b/docker/debian10/Dockerfile
index fb72328..f8a5f8c 100644
--- a/docker/debian10/Dockerfile
+++ b/docker/debian10/Dockerfile
@@ -18,7 +18,7 @@
#
FROM debian:buster
-MAINTAINER Apache ORC project <de...@orc.apache.org>
+LABEL maintainer="Apache ORC project <de...@orc.apache.org>"
RUN apt-get update
RUN apt-get install -y \
diff --git a/docker/debian8/Dockerfile b/docker/debian8/Dockerfile
index 34a4b95..3b8dbda 100644
--- a/docker/debian8/Dockerfile
+++ b/docker/debian8/Dockerfile
@@ -18,7 +18,7 @@
#
FROM debian:8
-MAINTAINER Apache ORC project <de...@orc.apache.org>
+LABEL maintainer="Apache ORC project <de...@orc.apache.org>"
ADD sources.list apt.conf /etc/apt/
diff --git a/docker/debian9/Dockerfile b/docker/debian9/Dockerfile
index 3d67157..8377a63 100644
--- a/docker/debian9/Dockerfile
+++ b/docker/debian9/Dockerfile
@@ -18,7 +18,7 @@
#
FROM debian:9
-MAINTAINER Apache ORC project <de...@orc.apache.org>
+LABEL maintainer="Apache ORC project <de...@orc.apache.org>"
RUN apt-get update
RUN apt-get install -y \
diff --git a/docker/ubuntu14/Dockerfile b/docker/ubuntu14/Dockerfile
index 0b2bbec..0f144c2 100644
--- a/docker/ubuntu14/Dockerfile
+++ b/docker/ubuntu14/Dockerfile
@@ -18,7 +18,7 @@
#
FROM ubuntu:14.04
-MAINTAINER Apache ORC project <de...@orc.apache.org>
+LABEL maintainer="Apache ORC project <de...@orc.apache.org>"
RUN apt-get update
RUN apt-get install -y software-properties-common
diff --git a/docker/ubuntu16/Dockerfile b/docker/ubuntu16/Dockerfile
index 9da6a14..37ead61 100644
--- a/docker/ubuntu16/Dockerfile
+++ b/docker/ubuntu16/Dockerfile
@@ -18,7 +18,7 @@
#
FROM ubuntu:16.04
-MAINTAINER Apache ORC project <de...@orc.apache.org>
+LABEL maintainer="Apache ORC project <de...@orc.apache.org>"
RUN apt-get update
RUN apt-get install -y \
diff --git a/docker/ubuntu18/Dockerfile b/docker/ubuntu18/Dockerfile
index 94b78e5..ea1b945 100644
--- a/docker/ubuntu18/Dockerfile
+++ b/docker/ubuntu18/Dockerfile
@@ -18,7 +18,7 @@
#
FROM ubuntu:18.04
-MAINTAINER Apache ORC project <de...@orc.apache.org>
+LABEL maintainer="Apache ORC project <de...@orc.apache.org>"
RUN ln -fs /usr/share/zoneinfo/America/Los_Angeles /etc/localtime
RUN apt-get update
@@ -47,4 +47,4 @@ CMD if [ ! -d orc ]; then \
mkdir build && \
cd build && \
cmake ../orc && \
- make package test-out
\ No newline at end of file
+ make package test-out
diff --git a/docker/ubuntu20-clang/Dockerfile b/docker/ubuntu20-clang/Dockerfile
index b970989..869c1e8 100644
--- a/docker/ubuntu20-clang/Dockerfile
+++ b/docker/ubuntu20-clang/Dockerfile
@@ -18,7 +18,7 @@
#
FROM ubuntu:20.04
-MAINTAINER Apache ORC project <de...@orc.apache.org>
+LABEL maintainer="Apache ORC project <de...@orc.apache.org>"
RUN ln -fs /usr/share/zoneinfo/America/Los_Angeles /etc/localtime
RUN apt-get update
@@ -49,4 +49,4 @@ CMD if [ ! -d orc ]; then \
mkdir build && \
cd build && \
cmake ../orc && \
- make package test-out
\ No newline at end of file
+ make package test-out
diff --git a/docker/ubuntu20/Dockerfile b/docker/ubuntu20/Dockerfile
index f5f7e76..316ec3f 100644
--- a/docker/ubuntu20/Dockerfile
+++ b/docker/ubuntu20/Dockerfile
@@ -18,7 +18,7 @@
#
FROM ubuntu:20.04
-MAINTAINER Apache ORC project <de...@orc.apache.org>
+LABEL maintainer="Apache ORC project <de...@orc.apache.org>"
RUN ln -fs /usr/share/zoneinfo/America/Los_Angeles /etc/localtime
RUN apt-get update
@@ -47,4 +47,4 @@ CMD if [ ! -d orc ]; then \
mkdir build && \
cd build && \
cmake ../orc && \
- make package test-out
\ No newline at end of file
+ make package test-out