From a90b2f580e3fa77d44b66c147f8b990c92c6315d Mon Sep 17 00:00:00 2001 From: realies <5107843+realies@users.noreply.github.com> Date: Tue, 18 Feb 2025 19:23:58 +0000 Subject: [PATCH 1/3] feature: add ffmpeg Signed-off-by: realies <5107843+realies@users.noreply.github.com> --- 29/apache/Dockerfile | 1 + 29/fpm-alpine/Dockerfile | 1 + 29/fpm/Dockerfile | 1 + 30/apache/Dockerfile | 1 + 30/fpm-alpine/Dockerfile | 1 + 30/fpm/Dockerfile | 1 + Dockerfile-alpine.template | 1 + Dockerfile-debian.template | 1 + 8 files changed, 8 insertions(+) diff --git a/29/apache/Dockerfile b/29/apache/Dockerfile index 4aec7fe7..c2af266d 100644 --- a/29/apache/Dockerfile +++ b/29/apache/Dockerfile @@ -6,6 +6,7 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ + ffmpeg \ busybox-static \ bzip2 \ libldap-common \ diff --git a/29/fpm-alpine/Dockerfile b/29/fpm-alpine/Dockerfile index 7eec3144..622626ea 100644 --- a/29/fpm-alpine/Dockerfile +++ b/29/fpm-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM php:8.2-fpm-alpine3.21 RUN set -ex; \ \ apk add --no-cache \ + ffmpeg \ imagemagick \ imagemagick-pdf \ imagemagick-jpeg \ diff --git a/29/fpm/Dockerfile b/29/fpm/Dockerfile index 819fd601..fe6ff578 100644 --- a/29/fpm/Dockerfile +++ b/29/fpm/Dockerfile @@ -6,6 +6,7 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ + ffmpeg \ busybox-static \ bzip2 \ libldap-common \ diff --git a/30/apache/Dockerfile b/30/apache/Dockerfile index 3bb31915..538b19c8 100644 --- a/30/apache/Dockerfile +++ b/30/apache/Dockerfile @@ -6,6 +6,7 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ + ffmpeg \ busybox-static \ bzip2 \ libldap-common \ diff --git a/30/fpm-alpine/Dockerfile b/30/fpm-alpine/Dockerfile index 7ad94ea2..578f11e5 100644 --- a/30/fpm-alpine/Dockerfile +++ b/30/fpm-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM php:8.2-fpm-alpine3.21 RUN set -ex; \ \ apk add --no-cache \ + ffmpeg \ imagemagick \ imagemagick-pdf \ imagemagick-jpeg \ diff --git a/30/fpm/Dockerfile b/30/fpm/Dockerfile index c904d52e..81e514e9 100644 --- a/30/fpm/Dockerfile +++ b/30/fpm/Dockerfile @@ -6,6 +6,7 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ + ffmpeg \ busybox-static \ bzip2 \ libldap-common \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index cf6af0ff..688b4e85 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -4,6 +4,7 @@ FROM php:%%PHP_VERSION%%-%%VARIANT%%%%ALPINE_VERSION%% RUN set -ex; \ \ apk add --no-cache \ + ffmpeg \ imagemagick \ imagemagick-pdf \ imagemagick-jpeg \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index cadae18a..ade20b7f 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -5,6 +5,7 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ + ffmpeg \ busybox-static \ bzip2 \ libldap-common \ From 5be2a020e05272e7c744c89ec308fd17fdb28db7 Mon Sep 17 00:00:00 2001 From: Josh Date: Sat, 1 Mar 2025 14:47:33 -0500 Subject: [PATCH 2/3] docs(readme): Document running as an arbitrary user (#2398) Signed-off-by: Josh --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index ac5b0e28..9f13f17c 100644 --- a/README.md +++ b/README.md @@ -141,6 +141,17 @@ If mounting additional volumes under `/var/www/html`, you should consider: **Data inside the main folder (`/var/www/html`) will be overridden/removed during installation and upgrades, unless listed in [upgrade.exclude](https://github.com/nextcloud/docker/blob/master/upgrade.exclude).** The additional volumes officially supported are already in that list, but custom volumes will need to be added by you. We suggest mounting custom storage volumes outside of `/var/www/html` and if possible read-only so that making this adjustment is unnecessary. If you must do so, however, you may build a custom image with a modified `/upgrade.exclude` file that incorporates your custom volume(s). +## Running as an arbitrary user / file permissions / changing the default container user + +The default user within a container is root (uid = 0). By default, processes inside the container will expect to have root privileges. Network services will drop privileges and use `www-data` to serve requests. + +Depending on your volumes configuration, this can lead to permission issues. You can address this by running the container with a different default user. When changing the default user, the image will no longer assume it has root privileges and will run all processes under the specified uid. To accomplish this, use the `--user` / `user` option in your container environment. + +See: + +- https://docs.docker.com/engine/containers/run/#user +- https://github.com/docker-library/docs/tree/master/php#running-as-an-arbitrary-user +- https://docs.podman.io/en/stable/markdown/podman-run.1.html#user-u-user-group ## Accessing the Nextcloud command-line interface (`occ`) From 86ab9d769cb0af61cfe3566de722b6730f6e6599 Mon Sep 17 00:00:00 2001 From: Josh Date: Sat, 1 Mar 2025 14:48:36 -0500 Subject: [PATCH 3/3] meta(templates): Re-order "Create new issue" links (#2400) Re-order and add additional links to highlight: - where to ask a question (forum) - documentation resources - upstream (server) bug reporting and enhancement ideas Some rewording as well. Signed-off-by: Josh --- .github/ISSUE_TEMPLATE/config.yml | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 5a3fc37e..1407f07e 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,10 +1,22 @@ contact_links: - - name: 🐛 Nextcloud issue - url: https://github.com/nextcloud/server/issues/new/choose - about: Bug reports and feature requests for Nextcloud - - name: 🐳 Docker Support and Help - url: https://forums.docker.com/ - about: Configuration, installation, networking and other questions - - name: ❓ Nextcloud Support and Help + - name: ❓ Ask a question url: https://help.nextcloud.com/ - about: Configuration, webserver/proxy or performance issues and other questions + about: Ask a question, get assistance or start a discussion regarding Nextcloud and/or this image + - name: Documentation - Nextcloud Server + url: https://docs.nextcloud.com/ + about: Official documentation for Nextcloud Server + - name: Documentation - Nextcloud Docker Image + url: https://github.com/nextcloud/docker/blob/master/README.md + about: Official documentation for this image + - name: 🐳 Documentation - Docker + url: https://docs.docker.com/ + about: Official documentation for Docker (installing, configuring, troubleshooting) + - name: 🐳 Docker Forum + url: https://forums.docker.com/ + about: Ask a question, get assistance or start a discussion regarding Docker + - name: 🐛 Bug Report: Nextcloud Server + url: https://github.com/nextcloud/server/issues/new/choose + about: Report a bug in Nextcloud Server + - name: Enhancement Idea: Nextcloud Server + url: https://github.com/nextcloud/server/issues/new/choose + about: Suggest an enhancement idea for Nextcloud Server