From 1d2ea57cbe91d8eff11f19d1ca8ddd378a3b871b Mon Sep 17 00:00:00 2001 From: Vincent Massol <vincent@massol.net> Date: Thu, 2 Dec 2021 17:52:19 +0100 Subject: [PATCH] [Misc] Use opencontainers rules for LABELs --- 12/mysql-tomcat/Dockerfile | 7 ++++++- 12/postgres-tomcat/Dockerfile | 7 ++++++- 13/mysql-tomcat/Dockerfile | 7 ++++++- 13/postgres-tomcat/Dockerfile | 7 ++++++- template/Dockerfile | 7 ++++++- 5 files changed, 30 insertions(+), 5 deletions(-) diff --git a/12/mysql-tomcat/Dockerfile b/12/mysql-tomcat/Dockerfile index 8fb7d85..3de0dc5 100644 --- a/12/mysql-tomcat/Dockerfile +++ b/12/mysql-tomcat/Dockerfile @@ -26,7 +26,12 @@ FROM tomcat:9-jdk11 # _/ /'`\ \_ \ /\ / | | | |`\ \ | | # |____||____| \/ \/ [___][__| \_][___] -LABEL maintainer="XWiki Development Team <committers@xwiki.org>" +LABEL org.opencontainers.image.authors='XWiki Development Team <committers@xwiki.org>' +LABEL org.opencontainers.image.url='https://hub.docker.com/_/xwiki' +LABEL org.opencontainers.image.documentation='https://hub.docker.com/_/xwiki' +LABEL org.opencontainers.image.source='https://github.com/xwiki/xwiki-docker.git' +LABEL org.opencontainers.image.vendor='xwiki.org' +LABEL org.opencontainers.image.licenses='LGPL-2.1' # Note: when using docker-compose, the ENV values below are overridden from the .env file. diff --git a/12/postgres-tomcat/Dockerfile b/12/postgres-tomcat/Dockerfile index 8bd5a70..444865b 100644 --- a/12/postgres-tomcat/Dockerfile +++ b/12/postgres-tomcat/Dockerfile @@ -26,7 +26,12 @@ FROM tomcat:9-jdk11 # _/ /'`\ \_ \ /\ / | | | |`\ \ | | # |____||____| \/ \/ [___][__| \_][___] -LABEL maintainer="XWiki Development Team <committers@xwiki.org>" +LABEL org.opencontainers.image.authors='XWiki Development Team <committers@xwiki.org>' +LABEL org.opencontainers.image.url='https://hub.docker.com/_/xwiki' +LABEL org.opencontainers.image.documentation='https://hub.docker.com/_/xwiki' +LABEL org.opencontainers.image.source='https://github.com/xwiki/xwiki-docker.git' +LABEL org.opencontainers.image.vendor='xwiki.org' +LABEL org.opencontainers.image.licenses='LGPL-2.1' # Note: when using docker-compose, the ENV values below are overridden from the .env file. diff --git a/13/mysql-tomcat/Dockerfile b/13/mysql-tomcat/Dockerfile index 1cef3da..f5b09d8 100644 --- a/13/mysql-tomcat/Dockerfile +++ b/13/mysql-tomcat/Dockerfile @@ -26,7 +26,12 @@ FROM tomcat:9-jdk11 # _/ /'`\ \_ \ /\ / | | | |`\ \ | | # |____||____| \/ \/ [___][__| \_][___] -LABEL maintainer="XWiki Development Team <committers@xwiki.org>" +LABEL org.opencontainers.image.authors='XWiki Development Team <committers@xwiki.org>' +LABEL org.opencontainers.image.url='https://hub.docker.com/_/xwiki' +LABEL org.opencontainers.image.documentation='https://hub.docker.com/_/xwiki' +LABEL org.opencontainers.image.source='https://github.com/xwiki/xwiki-docker.git' +LABEL org.opencontainers.image.vendor='xwiki.org' +LABEL org.opencontainers.image.licenses='LGPL-2.1' # Note: when using docker-compose, the ENV values below are overridden from the .env file. diff --git a/13/postgres-tomcat/Dockerfile b/13/postgres-tomcat/Dockerfile index 78b00ab..3256bf2 100644 --- a/13/postgres-tomcat/Dockerfile +++ b/13/postgres-tomcat/Dockerfile @@ -26,7 +26,12 @@ FROM tomcat:9-jdk11 # _/ /'`\ \_ \ /\ / | | | |`\ \ | | # |____||____| \/ \/ [___][__| \_][___] -LABEL maintainer="XWiki Development Team <committers@xwiki.org>" +LABEL org.opencontainers.image.authors='XWiki Development Team <committers@xwiki.org>' +LABEL org.opencontainers.image.url='https://hub.docker.com/_/xwiki' +LABEL org.opencontainers.image.documentation='https://hub.docker.com/_/xwiki' +LABEL org.opencontainers.image.source='https://github.com/xwiki/xwiki-docker.git' +LABEL org.opencontainers.image.vendor='xwiki.org' +LABEL org.opencontainers.image.licenses='LGPL-2.1' # Note: when using docker-compose, the ENV values below are overridden from the .env file. diff --git a/template/Dockerfile b/template/Dockerfile index 1472ff7..1e03ba6 100644 --- a/template/Dockerfile +++ b/template/Dockerfile @@ -26,7 +26,12 @@ FROM tomcat:9-jdk11 # _/ /'`\\ \\_ \\ /\\ / | | | |`\\ \\ | | # |____||____| \\/ \\/ [___][__| \\_][___] -LABEL maintainer="XWiki Development Team <committers@xwiki.org>" +LABEL org.opencontainers.image.authors='XWiki Development Team <committers@xwiki.org>' +LABEL org.opencontainers.image.url='https://hub.docker.com/_/xwiki' +LABEL org.opencontainers.image.documentation='https://hub.docker.com/_/xwiki' +LABEL org.opencontainers.image.source='https://github.com/xwiki/xwiki-docker.git' +LABEL org.opencontainers.image.vendor='xwiki.org' +LABEL org.opencontainers.image.licenses='LGPL-2.1' # Note: when using docker-compose, the ENV values below are overridden from the .env file. -- GitLab