From b7b0bbde654034abc545d610cf0be183f48f4027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20M=C3=BCller?= Date: Thu, 24 Oct 2024 19:34:01 +0200 Subject: [PATCH 1/2] Added opencontainer labels to images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Philipp Müller --- 28/apache/Dockerfile | 12 ++++++++++++ 28/fpm-alpine/Dockerfile | 12 ++++++++++++ 28/fpm/Dockerfile | 12 ++++++++++++ 29/apache/Dockerfile | 12 ++++++++++++ 29/fpm-alpine/Dockerfile | 12 ++++++++++++ 29/fpm/Dockerfile | 12 ++++++++++++ 30/apache/Dockerfile | 12 ++++++++++++ 30/fpm-alpine/Dockerfile | 12 ++++++++++++ 30/fpm/Dockerfile | 12 ++++++++++++ Dockerfile-alpine.template | 12 ++++++++++++ Dockerfile-debian.template | 12 ++++++++++++ 11 files changed, 132 insertions(+) diff --git a/28/apache/Dockerfile b/28/apache/Dockerfile index d63fb3a8..b6f8719a 100644 --- a/28/apache/Dockerfile +++ b/28/apache/Dockerfile @@ -1,6 +1,18 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template FROM php:8.2-apache-bookworm +# OCI annotations +LABEL org.opencontainers.image.authors="Nextcloud Community" \ + org.opencontainers.image.title="Nextcloud" \ + org.opencontainers.image.description="Nextcloud is a self-hosted platform for file sharing and collaboration" \ + org.opencontainers.image.documentation="https://hub.docker.com/_/nextcloud" \ + org.opencontainers.image.base.name="docker.io/library/php:8.2-apache-bookworm" \ + org.opencontainers.image.licenses="AGPL-3.0" \ + org.opencontainers.image.source="https://hub.docker.com/_/nextcloud" \ + org.opencontainers.image.vendor="Nextcloud Community" \ + org.opencontainers.image.version="28.0.11" \ + org.opencontainers.image.url="https://github.com/nextcloud/docker" + # entrypoint.sh and cron.sh dependencies RUN set -ex; \ \ diff --git a/28/fpm-alpine/Dockerfile b/28/fpm-alpine/Dockerfile index a7352299..8dec0c8e 100644 --- a/28/fpm-alpine/Dockerfile +++ b/28/fpm-alpine/Dockerfile @@ -1,6 +1,18 @@ # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template FROM php:8.2-fpm-alpine3.20 +# OCI annotations +LABEL org.opencontainers.image.authors="Nextcloud Community" \ + org.opencontainers.image.title="Nextcloud" \ + org.opencontainers.image.description="Nextcloud is a self-hosted platform for file sharing and collaboration" \ + org.opencontainers.image.documentation="https://hub.docker.com/_/nextcloud" \ + org.opencontainers.image.base.name="docker.io/library/php:8.2-fpm-alpine3.20" \ + org.opencontainers.image.licenses="AGPL-3.0" \ + org.opencontainers.image.source="https://hub.docker.com/_/nextcloud" \ + org.opencontainers.image.vendor="Nextcloud Community" \ + org.opencontainers.image.version="28.0.11" \ + org.opencontainers.image.url="https://github.com/nextcloud/docker" + # entrypoint.sh and cron.sh dependencies RUN set -ex; \ \ diff --git a/28/fpm/Dockerfile b/28/fpm/Dockerfile index ae69769d..eccc0500 100644 --- a/28/fpm/Dockerfile +++ b/28/fpm/Dockerfile @@ -1,6 +1,18 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template FROM php:8.2-fpm-bookworm +# OCI annotations +LABEL org.opencontainers.image.authors="Nextcloud Community" \ + org.opencontainers.image.title="Nextcloud" \ + org.opencontainers.image.description="Nextcloud is a self-hosted platform for file sharing and collaboration" \ + org.opencontainers.image.documentation="https://hub.docker.com/_/nextcloud" \ + org.opencontainers.image.base.name="docker.io/library/php:8.2-fpm-bookworm" \ + org.opencontainers.image.licenses="AGPL-3.0" \ + org.opencontainers.image.source="https://hub.docker.com/_/nextcloud" \ + org.opencontainers.image.vendor="Nextcloud Community" \ + org.opencontainers.image.version="28.0.11" \ + org.opencontainers.image.url="https://github.com/nextcloud/docker" + # entrypoint.sh and cron.sh dependencies RUN set -ex; \ \ diff --git a/29/apache/Dockerfile b/29/apache/Dockerfile index 8e9316c9..f55e2de4 100644 --- a/29/apache/Dockerfile +++ b/29/apache/Dockerfile @@ -1,6 +1,18 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template FROM php:8.2-apache-bookworm +# OCI annotations +LABEL org.opencontainers.image.authors="Nextcloud Community" \ + org.opencontainers.image.title="Nextcloud" \ + org.opencontainers.image.description="Nextcloud is a self-hosted platform for file sharing and collaboration" \ + org.opencontainers.image.documentation="https://hub.docker.com/_/nextcloud" \ + org.opencontainers.image.base.name="docker.io/library/php:8.2-apache-bookworm" \ + org.opencontainers.image.licenses="AGPL-3.0" \ + org.opencontainers.image.source="https://hub.docker.com/_/nextcloud" \ + org.opencontainers.image.vendor="Nextcloud Community" \ + org.opencontainers.image.version="29.0.8" \ + org.opencontainers.image.url="https://github.com/nextcloud/docker" + # entrypoint.sh and cron.sh dependencies RUN set -ex; \ \ diff --git a/29/fpm-alpine/Dockerfile b/29/fpm-alpine/Dockerfile index 5344aed5..94e4e311 100644 --- a/29/fpm-alpine/Dockerfile +++ b/29/fpm-alpine/Dockerfile @@ -1,6 +1,18 @@ # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template FROM php:8.2-fpm-alpine3.20 +# OCI annotations +LABEL org.opencontainers.image.authors="Nextcloud Community" \ + org.opencontainers.image.title="Nextcloud" \ + org.opencontainers.image.description="Nextcloud is a self-hosted platform for file sharing and collaboration" \ + org.opencontainers.image.documentation="https://hub.docker.com/_/nextcloud" \ + org.opencontainers.image.base.name="docker.io/library/php:8.2-fpm-alpine3.20" \ + org.opencontainers.image.licenses="AGPL-3.0" \ + org.opencontainers.image.source="https://hub.docker.com/_/nextcloud" \ + org.opencontainers.image.vendor="Nextcloud Community" \ + org.opencontainers.image.version="29.0.8" \ + org.opencontainers.image.url="https://github.com/nextcloud/docker" + # entrypoint.sh and cron.sh dependencies RUN set -ex; \ \ diff --git a/29/fpm/Dockerfile b/29/fpm/Dockerfile index a69317bb..cecf53d3 100644 --- a/29/fpm/Dockerfile +++ b/29/fpm/Dockerfile @@ -1,6 +1,18 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template FROM php:8.2-fpm-bookworm +# OCI annotations +LABEL org.opencontainers.image.authors="Nextcloud Community" \ + org.opencontainers.image.title="Nextcloud" \ + org.opencontainers.image.description="Nextcloud is a self-hosted platform for file sharing and collaboration" \ + org.opencontainers.image.documentation="https://hub.docker.com/_/nextcloud" \ + org.opencontainers.image.base.name="docker.io/library/php:8.2-fpm-bookworm" \ + org.opencontainers.image.licenses="AGPL-3.0" \ + org.opencontainers.image.source="https://hub.docker.com/_/nextcloud" \ + org.opencontainers.image.vendor="Nextcloud Community" \ + org.opencontainers.image.version="29.0.8" \ + org.opencontainers.image.url="https://github.com/nextcloud/docker" + # entrypoint.sh and cron.sh dependencies RUN set -ex; \ \ diff --git a/30/apache/Dockerfile b/30/apache/Dockerfile index b01d9611..66b7a894 100644 --- a/30/apache/Dockerfile +++ b/30/apache/Dockerfile @@ -1,6 +1,18 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template FROM php:8.2-apache-bookworm +# OCI annotations +LABEL org.opencontainers.image.authors="Nextcloud Community" \ + org.opencontainers.image.title="Nextcloud" \ + org.opencontainers.image.description="Nextcloud is a self-hosted platform for file sharing and collaboration" \ + org.opencontainers.image.documentation="https://hub.docker.com/_/nextcloud" \ + org.opencontainers.image.base.name="docker.io/library/php:8.2-apache-bookworm" \ + org.opencontainers.image.licenses="AGPL-3.0" \ + org.opencontainers.image.source="https://hub.docker.com/_/nextcloud" \ + org.opencontainers.image.vendor="Nextcloud Community" \ + org.opencontainers.image.version="30.0.1" \ + org.opencontainers.image.url="https://github.com/nextcloud/docker" + # entrypoint.sh and cron.sh dependencies RUN set -ex; \ \ diff --git a/30/fpm-alpine/Dockerfile b/30/fpm-alpine/Dockerfile index a6197cc8..122b9b61 100644 --- a/30/fpm-alpine/Dockerfile +++ b/30/fpm-alpine/Dockerfile @@ -1,6 +1,18 @@ # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template FROM php:8.2-fpm-alpine3.20 +# OCI annotations +LABEL org.opencontainers.image.authors="Nextcloud Community" \ + org.opencontainers.image.title="Nextcloud" \ + org.opencontainers.image.description="Nextcloud is a self-hosted platform for file sharing and collaboration" \ + org.opencontainers.image.documentation="https://hub.docker.com/_/nextcloud" \ + org.opencontainers.image.base.name="docker.io/library/php:8.2-fpm-alpine3.20" \ + org.opencontainers.image.licenses="AGPL-3.0" \ + org.opencontainers.image.source="https://hub.docker.com/_/nextcloud" \ + org.opencontainers.image.vendor="Nextcloud Community" \ + org.opencontainers.image.version="30.0.1" \ + org.opencontainers.image.url="https://github.com/nextcloud/docker" + # entrypoint.sh and cron.sh dependencies RUN set -ex; \ \ diff --git a/30/fpm/Dockerfile b/30/fpm/Dockerfile index 9ab2e055..e955e8b1 100644 --- a/30/fpm/Dockerfile +++ b/30/fpm/Dockerfile @@ -1,6 +1,18 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template FROM php:8.2-fpm-bookworm +# OCI annotations +LABEL org.opencontainers.image.authors="Nextcloud Community" \ + org.opencontainers.image.title="Nextcloud" \ + org.opencontainers.image.description="Nextcloud is a self-hosted platform for file sharing and collaboration" \ + org.opencontainers.image.documentation="https://hub.docker.com/_/nextcloud" \ + org.opencontainers.image.base.name="docker.io/library/php:8.2-fpm-bookworm" \ + org.opencontainers.image.licenses="AGPL-3.0" \ + org.opencontainers.image.source="https://hub.docker.com/_/nextcloud" \ + org.opencontainers.image.vendor="Nextcloud Community" \ + org.opencontainers.image.version="30.0.1" \ + org.opencontainers.image.url="https://github.com/nextcloud/docker" + # entrypoint.sh and cron.sh dependencies RUN set -ex; \ \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index de69eef2..27c69720 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -1,5 +1,17 @@ FROM php:%%PHP_VERSION%%-%%VARIANT%%%%ALPINE_VERSION%% +# OCI annotations +LABEL org.opencontainers.image.authors="Nextcloud Community" \ + org.opencontainers.image.title="Nextcloud" \ + org.opencontainers.image.description="Nextcloud is a self-hosted platform for file sharing and collaboration" \ + org.opencontainers.image.documentation="https://hub.docker.com/_/nextcloud" \ + org.opencontainers.image.base.name="docker.io/library/php:%%PHP_VERSION%%-%%VARIANT%%%%ALPINE_VERSION%%" \ + org.opencontainers.image.licenses="AGPL-3.0" \ + org.opencontainers.image.source="https://hub.docker.com/_/nextcloud" \ + org.opencontainers.image.vendor="Nextcloud Community" \ + org.opencontainers.image.version="%%VERSION%%" \ + org.opencontainers.image.url="https://github.com/nextcloud/docker" + # entrypoint.sh and cron.sh dependencies RUN set -ex; \ \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 8b66dd34..78d3f251 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -1,5 +1,17 @@ FROM php:%%PHP_VERSION%%-%%VARIANT%%-%%DEBIAN_VERSION%% +# OCI annotations +LABEL org.opencontainers.image.authors="Nextcloud Community" \ + org.opencontainers.image.title="Nextcloud" \ + org.opencontainers.image.description="Nextcloud is a self-hosted platform for file sharing and collaboration" \ + org.opencontainers.image.documentation="https://hub.docker.com/_/nextcloud" \ + org.opencontainers.image.base.name="docker.io/library/php:%%PHP_VERSION%%-%%VARIANT%%-%%DEBIAN_VERSION%%" \ + org.opencontainers.image.licenses="AGPL-3.0" \ + org.opencontainers.image.source="https://hub.docker.com/_/nextcloud" \ + org.opencontainers.image.vendor="Nextcloud Community" \ + org.opencontainers.image.version="%%VERSION%%" \ + org.opencontainers.image.url="https://github.com/nextcloud/docker" + # entrypoint.sh and cron.sh dependencies RUN set -ex; \ \ From 2f4de23ea11705a977984c273082efa2d4dcf743 Mon Sep 17 00:00:00 2001 From: Josh Date: Sat, 14 Dec 2024 14:24:34 -0500 Subject: [PATCH 2/2] docs(README): Basic status badges Signed-off-by: Josh --- README.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/README.md b/README.md index b3d5e7df..152489b2 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,11 @@ +![GitHub last commit](https://img.shields.io/github/last-commit/nextcloud/docker) +[![GitHub Release](https://img.shields.io/github/v/release/nextcloud/docker?link=https%3A%2F%2Fgithub.com%2Fnextcloud%2Fdocker%2Freleases%2Flatest&label=latest%20Image)](https://github.com/nextcloud/docker/releases/) +[![Docker Image Version](https://img.shields.io/docker/v/library/nextcloud?sort=semver&logo=nextcloud&label=Nextcloud)](https://nextcloud.com/changelog/) +![GitHub commits since latest release](https://img.shields.io/github/commits-since/nextcloud/docker/latest) +![GitHub commit activity](https://img.shields.io/github/commit-activity/m/nextcloud/docker) +![GitHub contributors](https://img.shields.io/github/contributors/nextcloud/docker?label=contributors%20-%20Thank%20you!) +![Docker Pulls](https://img.shields.io/docker/pulls/library/nextcloud) + # What is Nextcloud? A safe home for all your data. Access & share your files, calendars, contacts, mail & more from any device, on your terms. @@ -19,6 +27,9 @@ The second option is a `fpm` container. It is based on the [php-fpm](https://hub Most Nextcloud Server administrative matters are covered in the official [Nextcloud Admin Manual](https://docs.nextcloud.com/server/latest/admin_manual/) or [other official Nextcloud documentation](https://docs.nextcloud.com) (which are all routinely updated). +[![Discourse Users](https://img.shields.io/discourse/users?server=https%3A%2F%2Fhelp.nextcloud.com&label=Community%20Forum&color=blue&link=https%3A%2F%2Fhelp.nextcloud.com%2F)](https://help.nextcloud.com/) +[![Discourse Posts](https://img.shields.io/discourse/posts?server=https%3A%2F%2Fhelp.nextcloud.com&label=Community%20Forum&color=blue&link=https%3A%2F%2Fhelp.nextcloud.com%2F)](https://help.nextcloud.com/) + **If you have any problems or usage questions while using the image, please ask for assistance on the [Nextcloud Community Help Forum](https://help.nextcloud.com)** rather than reporting them as "bugs" (unless they are bugs of course). This helps the maintainers (who are volunteers) remain focused on making the image better (rather than responding solely to one-on-one support issues). (Tip: Some of the maintainers are also regular responders to help requests on the [community help forum](https://help.nextcloud.com/).) @@ -732,8 +743,16 @@ If there is a relevant existing open issue, you can either add to the discussion If you believe you've found a new bug, please create a new Issue so that others can try to reproduce it and remediation can be tracked. +![GitHub Issues or Pull Requests](https://img.shields.io/github/issues/nextcloud/docker?label=Open%20Issues) +![GitHub Issues or Pull Requests by label](https://img.shields.io/github/issues/nextcloud/docker/bug?style=flat&label=Bug%20Reports&color=red) +![GitHub Issues or Pull Requests by label](https://img.shields.io/github/issues/nextcloud/docker/enhancement?style=flat&label=Enhancement%20Ideas&color=green) +![GitHub Issues or Pull Requests by label](https://img.shields.io/github/issues/nextcloud/docker/good%20first%20issue?style=flat&label=Good%20First%20Issues) + **If you have any problems or usage questions while using the image, please ask for assistance on the [Nextcloud Community Help Forum](https://help.nextcloud.com)** rather than reporting them as "bugs" (unless they really are bugs of course). This helps the maintainers (who are volunteers) remain focused on making the image better (rather than responding solely to one-on-one support issues). (Tip: Some of the maintainers are also regular responders to help requests on the [Nextcloud Community Help Forum](https://help.nextcloud.com).) +[![Discourse Users](https://img.shields.io/discourse/users?server=https%3A%2F%2Fhelp.nextcloud.com&label=Community%20Forum&color=blue&link=https%3A%2F%2Fhelp.nextcloud.com%2F)](https://help.nextcloud.com/) +[![Discourse Posts](https://img.shields.io/discourse/posts?server=https%3A%2F%2Fhelp.nextcloud.com&label=Community%20Forum&color=blue&link=https%3A%2F%2Fhelp.nextcloud.com%2F)](https://help.nextcloud.com/) + Most Nextcloud Server matters are covered in the official [Nextcloud Admin Manual](https://docs.nextcloud.com/server/latest/admin_manual/) or the [other official Nextcloud documentation](https://docs.nextcloud.com) (which are routinely updated).