This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/orc.git
The following commit(s) were added to refs/heads/main by this push:
new 2cec04477 ORC-1758: Use `OpenContainers` Annotations in docker images
2cec04477 is described below
commit 2cec04477bff7387d45b57dd53798103aeb77494
Author: Dongjoon Hyun <[email protected]>
AuthorDate: Thu Aug 8 22:12:14 2024 -0700
ORC-1758: Use `OpenContainers` Annotations in docker images
### What changes were proposed in this pull request?
This PR aims to add `OpenContainers` Annotations to docker image.
- https://specs.opencontainers.org/image-spec/annotations/
### Why are the changes needed?
**AFTER**
```
$ docker inspect apache/orc-dev:ubuntu24 | jq '.[0].Config.Labels'
{
"org.opencontainers.image.authors": "Apache ORC project
<devorc.apache.org>",
"org.opencontainers.image.licenses": "Apache-2.0",
"org.opencontainers.image.ref.name": "Apache ORC on Ubuntu 24",
"org.opencontainers.image.version": ""
}
```
### How was this patch tested?
Manual review.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #2002 from dongjoon-hyun/ORC-1758.
Authored-by: Dongjoon Hyun <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
---
docker/debian11/Dockerfile | 5 ++++-
docker/debian12/Dockerfile | 5 ++++-
docker/fedora37/Dockerfile | 7 +++++--
docker/oraclelinux9/Dockerfile | 3 ++-
docker/ubuntu22/Dockerfile | 5 ++++-
docker/ubuntu24/Dockerfile | 5 ++++-
site/Dockerfile | 5 ++++-
7 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/docker/debian11/Dockerfile b/docker/debian11/Dockerfile
index fb804a316..7af433de1 100644
--- a/docker/debian11/Dockerfile
+++ b/docker/debian11/Dockerfile
@@ -18,7 +18,10 @@
#
FROM debian:bullseye
-LABEL maintainer="Apache ORC project <[email protected]>"
+LABEL org.opencontainers.image.authors="Apache ORC project
<[email protected]>"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.ref.name="Apache ORC on Debian 11"
+LABEL org.opencontainers.image.version=""
ARG jdk=17
RUN apt-get update
diff --git a/docker/debian12/Dockerfile b/docker/debian12/Dockerfile
index f0c2a600e..ae341183f 100644
--- a/docker/debian12/Dockerfile
+++ b/docker/debian12/Dockerfile
@@ -18,7 +18,10 @@
#
FROM debian:bookworm
-LABEL maintainer="Apache ORC project <[email protected]>"
+LABEL org.opencontainers.image.authors="Apache ORC project
<[email protected]>"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.ref.name="Apache ORC on Debian 12"
+LABEL org.opencontainers.image.version=""
ARG jdk=17
RUN apt-get update
diff --git a/docker/fedora37/Dockerfile b/docker/fedora37/Dockerfile
index bf4a50fc1..a2d0748de 100644
--- a/docker/fedora37/Dockerfile
+++ b/docker/fedora37/Dockerfile
@@ -14,11 +14,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# ORC compile for CentOS 7
+# ORC compile for Fedora Linux 37
#
FROM fedora:37
-LABEL maintainer="Apache ORC project <[email protected]>"
+LABEL org.opencontainers.image.authors="Apache ORC project
<[email protected]>"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.ref.name="Apache ORC on Fedora Linux 37"
+LABEL org.opencontainers.image.version=""
RUN yum check-update || true
RUN yum install -y \
diff --git a/docker/oraclelinux9/Dockerfile b/docker/oraclelinux9/Dockerfile
index 094ec828f..a0f962349 100644
--- a/docker/oraclelinux9/Dockerfile
+++ b/docker/oraclelinux9/Dockerfile
@@ -18,7 +18,8 @@
#
FROM oraclelinux:9
-LABEL maintainer="Apache ORC project <[email protected]>"
+LABEL org.opencontainers.image.authors="Apache ORC project
<[email protected]>"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
RUN yum check-update || true
RUN yum install -y \
diff --git a/docker/ubuntu22/Dockerfile b/docker/ubuntu22/Dockerfile
index 81f626951..03863f20a 100644
--- a/docker/ubuntu22/Dockerfile
+++ b/docker/ubuntu22/Dockerfile
@@ -18,7 +18,10 @@
#
FROM ubuntu:22.04
-LABEL maintainer="Apache ORC project <[email protected]>"
+LABEL org.opencontainers.image.authors="Apache ORC project
<[email protected]>"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.ref.name="Apache ORC on Ubuntu 22"
+LABEL org.opencontainers.image.version=""
ARG jdk=17
ARG cc=gcc
diff --git a/docker/ubuntu24/Dockerfile b/docker/ubuntu24/Dockerfile
index 34b392433..00cd2d67e 100644
--- a/docker/ubuntu24/Dockerfile
+++ b/docker/ubuntu24/Dockerfile
@@ -18,7 +18,10 @@
#
FROM ubuntu:24.04
-LABEL maintainer="Apache ORC project <[email protected]>"
+LABEL org.opencontainers.image.authors="Apache ORC project
<[email protected]>"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.ref.name="Apache ORC on Ubuntu 24"
+LABEL org.opencontainers.image.version=""
ARG jdk=21
ARG cc=gcc
diff --git a/site/Dockerfile b/site/Dockerfile
index ff0a61397..d8b1413ed 100644
--- a/site/Dockerfile
+++ b/site/Dockerfile
@@ -18,7 +18,10 @@
#
FROM ubuntu:20.04
-LABEL maintainer="Apache ORC project <[email protected]>"
+LABEL org.opencontainers.image.authors="Apache ORC project
<[email protected]>"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.ref.name="Apache ORC site builder"
+LABEL org.opencontainers.image.version=""
RUN ln -fs /usr/share/zoneinfo/America/Los_Angeles /etc/localtime
RUN apt-get update
