From 8a56af037c149bd5526ecd3f7a8d207b8c6c28d6 Mon Sep 17 00:00:00 2001 From: Luca Comellini Date: Tue, 31 Jan 2023 19:09:34 -0800 Subject: [PATCH] Add OCI labels Adds labels according to the spec https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys --- Dockerfile-alpine-perl.template | 2 ++ Dockerfile-alpine-slim.template | 9 ++++++++- Dockerfile-alpine.template | 2 ++ Dockerfile-debian-perl.template | 2 ++ Dockerfile-debian.template | 9 ++++++++- mainline/alpine-perl/Dockerfile | 2 ++ mainline/alpine-slim/Dockerfile | 9 ++++++++- mainline/alpine/Dockerfile | 2 ++ mainline/debian-perl/Dockerfile | 2 ++ mainline/debian/Dockerfile | 9 ++++++++- stable/alpine-perl/Dockerfile | 2 ++ stable/alpine-slim/Dockerfile | 9 ++++++++- stable/alpine/Dockerfile | 2 ++ stable/debian-perl/Dockerfile | 2 ++ stable/debian/Dockerfile | 9 ++++++++- 15 files changed, 66 insertions(+), 6 deletions(-) diff --git a/Dockerfile-alpine-perl.template b/Dockerfile-alpine-perl.template index a1aaac54..69537e75 100644 --- a/Dockerfile-alpine-perl.template +++ b/Dockerfile-alpine-perl.template @@ -1,5 +1,7 @@ FROM nginx:%%NGINX_VERSION%%-alpine +LABEL org.opencontainers.image.base.name="docker.io/library/nginx:%%NGINX_VERSION%%-alpine" + RUN set -x \ && apkArch="$(cat /etc/apk/arch)" \ && nginxPackages="%%PACKAGES%% diff --git a/Dockerfile-alpine-slim.template b/Dockerfile-alpine-slim.template index 57b9be42..1114e59b 100644 --- a/Dockerfile-alpine-slim.template +++ b/Dockerfile-alpine-slim.template @@ -1,6 +1,13 @@ FROM alpine:%%ALPINE_VERSION%% -LABEL maintainer="NGINX Docker Maintainers " +LABEL org.opencontainers.image.title="nginx" +LABEL org.opencontainers.image.description="Official build of nginx for Docker." +LABEL org.opencontainers.image.url="https://www.nginx.org" +LABEL org.opencontainers.image.source="https://github.com/nginx/nginx" +LABEL org.opencontainers.image.documentation="https://nginx.org/en/docs" +LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers " +LABEL org.opencontainers.image.version="%%NGINX_VERSION%%" +LABEL org.opencontainers.image.base.name="docker.io/library/alpine:%%ALPINE_VERSION%%" ENV NGINX_VERSION %%NGINX_VERSION%% ENV PKG_RELEASE %%PKG_RELEASE%% diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 8c464dfd..65ee8867 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -1,5 +1,7 @@ FROM nginx:%%NGINX_VERSION%%-alpine-slim +LABEL org.opencontainers.image.base.name="docker.io/library/nginx:%%NGINX_VERSION%%-alpine-slim" + ENV NJS_VERSION %%NJS_VERSION%% RUN set -x \ diff --git a/Dockerfile-debian-perl.template b/Dockerfile-debian-perl.template index 38b65598..7349b1e0 100644 --- a/Dockerfile-debian-perl.template +++ b/Dockerfile-debian-perl.template @@ -1,5 +1,7 @@ FROM nginx:%%NGINX_VERSION%% +LABEL org.opencontainers.image.base.name="docker.io/library/nginx:%%NGINX_VERSION%%" + RUN set -x \ && apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y gnupg1 ca-certificates \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index b4f3bd94..61b2cb0b 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -1,6 +1,13 @@ FROM debian:%%DEBIAN_VERSION%%-slim -LABEL maintainer="NGINX Docker Maintainers " +LABEL org.opencontainers.image.title="nginx" +LABEL org.opencontainers.image.description="Official build of nginx for Docker." +LABEL org.opencontainers.image.url="https://www.nginx.org" +LABEL org.opencontainers.image.source="https://github.com/nginx/nginx" +LABEL org.opencontainers.image.documentation="https://nginx.org/en/docs" +LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers " +LABEL org.opencontainers.image.version="%%NGINX_VERSION%%" +LABEL org.opencontainers.image.base.name="docker.io/library/debian:%%DEBIAN_VERSION%%-slim" ENV NGINX_VERSION %%NGINX_VERSION%% ENV NJS_VERSION %%NJS_VERSION%% diff --git a/mainline/alpine-perl/Dockerfile b/mainline/alpine-perl/Dockerfile index 4cc786d5..effd653e 100644 --- a/mainline/alpine-perl/Dockerfile +++ b/mainline/alpine-perl/Dockerfile @@ -5,6 +5,8 @@ # FROM nginx:1.23.3-alpine +LABEL org.opencontainers.image.base.name="docker.io/library/nginx:1.23.3-alpine" + RUN set -x \ && apkArch="$(cat /etc/apk/arch)" \ && nginxPackages=" \ diff --git a/mainline/alpine-slim/Dockerfile b/mainline/alpine-slim/Dockerfile index 89ad6412..9c241722 100644 --- a/mainline/alpine-slim/Dockerfile +++ b/mainline/alpine-slim/Dockerfile @@ -5,7 +5,14 @@ # FROM alpine:3.17 -LABEL maintainer="NGINX Docker Maintainers " +LABEL org.opencontainers.image.title="nginx" +LABEL org.opencontainers.image.description="Official build of nginx for Docker." +LABEL org.opencontainers.image.url="https://www.nginx.org" +LABEL org.opencontainers.image.source="https://github.com/nginx/nginx" +LABEL org.opencontainers.image.documentation="https://nginx.org/en/docs" +LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers " +LABEL org.opencontainers.image.version="1.23.3" +LABEL org.opencontainers.image.base.name="docker.io/library/alpine:3.17" ENV NGINX_VERSION 1.23.3 ENV PKG_RELEASE 1 diff --git a/mainline/alpine/Dockerfile b/mainline/alpine/Dockerfile index 68eacfd4..0957d19c 100644 --- a/mainline/alpine/Dockerfile +++ b/mainline/alpine/Dockerfile @@ -5,6 +5,8 @@ # FROM nginx:1.23.3-alpine-slim +LABEL org.opencontainers.image.base.name="docker.io/library/nginx:1.23.3-alpine-slim" + ENV NJS_VERSION 0.7.9 RUN set -x \ diff --git a/mainline/debian-perl/Dockerfile b/mainline/debian-perl/Dockerfile index fc304418..2570ddb2 100644 --- a/mainline/debian-perl/Dockerfile +++ b/mainline/debian-perl/Dockerfile @@ -5,6 +5,8 @@ # FROM nginx:1.23.3 +LABEL org.opencontainers.image.base.name="docker.io/library/nginx:1.23.3" + RUN set -x \ && apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y gnupg1 ca-certificates \ diff --git a/mainline/debian/Dockerfile b/mainline/debian/Dockerfile index e3e3f844..68e006ca 100644 --- a/mainline/debian/Dockerfile +++ b/mainline/debian/Dockerfile @@ -5,7 +5,14 @@ # FROM debian:bullseye-slim -LABEL maintainer="NGINX Docker Maintainers " +LABEL org.opencontainers.image.title="nginx" +LABEL org.opencontainers.image.description="Official build of nginx for Docker." +LABEL org.opencontainers.image.url="https://www.nginx.org" +LABEL org.opencontainers.image.source="https://github.com/nginx/nginx" +LABEL org.opencontainers.image.documentation="https://nginx.org/en/docs" +LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers " +LABEL org.opencontainers.image.version="1.23.3" +LABEL org.opencontainers.image.base.name="docker.io/library/debian:bullseye-slim" ENV NGINX_VERSION 1.23.3 ENV NJS_VERSION 0.7.9 diff --git a/stable/alpine-perl/Dockerfile b/stable/alpine-perl/Dockerfile index b681d57c..f70c43bf 100644 --- a/stable/alpine-perl/Dockerfile +++ b/stable/alpine-perl/Dockerfile @@ -5,6 +5,8 @@ # FROM nginx:1.22.1-alpine +LABEL org.opencontainers.image.base.name="docker.io/library/nginx:1.22.1-alpine" + RUN set -x \ && apkArch="$(cat /etc/apk/arch)" \ && nginxPackages=" \ diff --git a/stable/alpine-slim/Dockerfile b/stable/alpine-slim/Dockerfile index ba490558..fb76a2e1 100644 --- a/stable/alpine-slim/Dockerfile +++ b/stable/alpine-slim/Dockerfile @@ -5,7 +5,14 @@ # FROM alpine:3.17 -LABEL maintainer="NGINX Docker Maintainers " +LABEL org.opencontainers.image.title="nginx" +LABEL org.opencontainers.image.description="Official build of nginx for Docker." +LABEL org.opencontainers.image.url="https://www.nginx.org" +LABEL org.opencontainers.image.source="https://github.com/nginx/nginx" +LABEL org.opencontainers.image.documentation="https://nginx.org/en/docs" +LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers " +LABEL org.opencontainers.image.version="1.22.1" +LABEL org.opencontainers.image.base.name="docker.io/library/alpine:3.17" ENV NGINX_VERSION 1.22.1 ENV PKG_RELEASE 1 diff --git a/stable/alpine/Dockerfile b/stable/alpine/Dockerfile index f7bf3881..7f7dd2fe 100644 --- a/stable/alpine/Dockerfile +++ b/stable/alpine/Dockerfile @@ -5,6 +5,8 @@ # FROM nginx:1.22.1-alpine-slim +LABEL org.opencontainers.image.base.name="docker.io/library/nginx:1.22.1-alpine-slim" + ENV NJS_VERSION 0.7.9 RUN set -x \ diff --git a/stable/debian-perl/Dockerfile b/stable/debian-perl/Dockerfile index 55d2b8ba..4e19eb45 100644 --- a/stable/debian-perl/Dockerfile +++ b/stable/debian-perl/Dockerfile @@ -5,6 +5,8 @@ # FROM nginx:1.22.1 +LABEL org.opencontainers.image.base.name="docker.io/library/nginx:1.22.1" + RUN set -x \ && apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y gnupg1 ca-certificates \ diff --git a/stable/debian/Dockerfile b/stable/debian/Dockerfile index 2bbeffd9..d5bacc46 100644 --- a/stable/debian/Dockerfile +++ b/stable/debian/Dockerfile @@ -5,7 +5,14 @@ # FROM debian:bullseye-slim -LABEL maintainer="NGINX Docker Maintainers " +LABEL org.opencontainers.image.title="nginx" +LABEL org.opencontainers.image.description="Official build of nginx for Docker." +LABEL org.opencontainers.image.url="https://www.nginx.org" +LABEL org.opencontainers.image.source="https://github.com/nginx/nginx" +LABEL org.opencontainers.image.documentation="https://nginx.org/en/docs" +LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers " +LABEL org.opencontainers.image.version="1.22.1" +LABEL org.opencontainers.image.base.name="docker.io/library/debian:bullseye-slim" ENV NGINX_VERSION 1.22.1 ENV NJS_VERSION 0.7.9