Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
65b1090e54 | ||
|
|
d6a9db3162 | ||
|
|
c89109f7db |
+35
@@ -1,5 +1,40 @@
|
|||||||
---
|
---
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
|
name: deploy to swarm-test.autonomic.zone
|
||||||
|
steps:
|
||||||
|
- name: deployment
|
||||||
|
image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
|
||||||
|
settings:
|
||||||
|
host: swarm-test.autonomic.zone
|
||||||
|
stack: nextcloud
|
||||||
|
generate_secrets: true
|
||||||
|
purge: true
|
||||||
|
deploy_key:
|
||||||
|
from_secret: drone_ssh_swarm_test
|
||||||
|
networks:
|
||||||
|
- proxy
|
||||||
|
environment:
|
||||||
|
DOMAIN: nextcloud.swarm-test.autonomic.zone
|
||||||
|
STACK_NAME: nextcloud
|
||||||
|
LETS_ENCRYPT_ENV: production
|
||||||
|
ADMIN_USER: foobar
|
||||||
|
FPM_TUNE_VERSION: v1
|
||||||
|
NGINX_CONF_VERSION: v1
|
||||||
|
MY_CNF_VERSION: v1
|
||||||
|
ENTRYPOINT_VERSION: v1
|
||||||
|
CRONTAB_VERSION: v1
|
||||||
|
PG_BACKUP_VERSION: v2
|
||||||
|
SECRET_DB_PASSWORD_VERSION: v1
|
||||||
|
SECRET_DB_ROOT_PASSWORD_VERSION: v1
|
||||||
|
SECRET_ADMIN_PASSWORD_VERSION: v1
|
||||||
|
SECRET_ONLYOFFICE_JWT_VERSION: v1
|
||||||
|
SECRET_BBB_SECRET_VERSION: v1
|
||||||
|
EXTRA_VOLUME: "/dev/null:/tmp/.dummy"
|
||||||
|
trigger:
|
||||||
|
branch:
|
||||||
|
- main
|
||||||
|
---
|
||||||
|
kind: pipeline
|
||||||
name: generate recipe catalogue
|
name: generate recipe catalogue
|
||||||
steps:
|
steps:
|
||||||
- name: release a new version
|
- name: release a new version
|
||||||
|
|||||||
+3
-1
@@ -25,7 +25,6 @@ EXTRA_VOLUME=/dev/null:/tmp/.dummy
|
|||||||
|
|
||||||
PHP_MEMORY_LIMIT=1G
|
PHP_MEMORY_LIMIT=1G
|
||||||
PHP_UPLOAD_LIMIT=512M
|
PHP_UPLOAD_LIMIT=512M
|
||||||
MEM_REQUEST_BODY_SIZE=$(( 1048576 * 16 ))
|
|
||||||
# fpm-tune, see: https://spot13.com/pmcalculator/
|
# fpm-tune, see: https://spot13.com/pmcalculator/
|
||||||
FPM_MAX_CHILDREN=16
|
FPM_MAX_CHILDREN=16
|
||||||
FPM_START_SERVERS=4
|
FPM_START_SERVERS=4
|
||||||
@@ -103,6 +102,9 @@ DEFAULT_QUOTA="10 GB"
|
|||||||
# USER_OIDC_LOGIN_ONLY=false
|
# USER_OIDC_LOGIN_ONLY=false
|
||||||
# SECRET_USER_OIDC_SECRET_VERSION=v1
|
# SECRET_USER_OIDC_SECRET_VERSION=v1
|
||||||
|
|
||||||
|
# Image / PDF previews with Imaginary (see README)
|
||||||
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.imaginary-preview.yml"
|
||||||
|
|
||||||
# HSTS Options
|
# HSTS Options
|
||||||
# Uncomment this line to enable HSTS: https://docs.nextcloud.com/server/30/admin_manual/installation/harden_server.html
|
# Uncomment this line to enable HSTS: https://docs.nextcloud.com/server/30/admin_manual/installation/harden_server.html
|
||||||
#HSTS_ENABLED=1
|
#HSTS_ENABLED=1
|
||||||
|
|||||||
@@ -1,91 +0,0 @@
|
|||||||
# Nextcloud Recipe Maintenance
|
|
||||||
|
|
||||||
This document describes how the Nextcloud recipe is maintained. It builds on
|
|
||||||
the floor set by [Federation Resolution
|
|
||||||
025](https://docs.coopcloud.tech/federation/resolutions/passed/025/) and
|
|
||||||
follows the [`MAINTENANCE.md`
|
|
||||||
template](https://docs.coopcloud.tech/maintainers/maintain/#maintenancemd-template)
|
|
||||||
described in the Co-op Cloud maintainers' docs.
|
|
||||||
|
|
||||||
All contributions should be made via a pull request so that quality and
|
|
||||||
consistency stay something others can rely on.
|
|
||||||
|
|
||||||
## Maintainers
|
|
||||||
|
|
||||||
Everyone can apply to be a recipe maintainer.
|
|
||||||
Simply add yourself to the list in the README.md and open a new pull request
|
|
||||||
with the change.
|
|
||||||
|
|
||||||
## Maintainer Responsibilities
|
|
||||||
|
|
||||||
This recipe commits to the following, which is tighter than the floor set by
|
|
||||||
Resolution 025 (stable-recipe category). However, these timelines are
|
|
||||||
best-effort, so we aim for them as good as possible:
|
|
||||||
|
|
||||||
- Respond to PRs / issues within 3 working days
|
|
||||||
- Apply security patches within 1 week of disclosure
|
|
||||||
- Ship patch / minor image updates within 2 weeks of upstream release
|
|
||||||
- Adopt major Nextcloud version updates within 1 release cycle of upstream
|
|
||||||
EOL of the previous major (see below)
|
|
||||||
- Keep documentation current
|
|
||||||
|
|
||||||
In order to meet these responsibilities each maintainer:
|
|
||||||
|
|
||||||
- Watches the repository so notifications arrive
|
|
||||||
- Keeps an eye on [Renovate](./renovate.json) updates and helps shepherd them through
|
|
||||||
- Has a working contact (Matrix handle or email) reachable by the others
|
|
||||||
|
|
||||||
## Release cadence
|
|
||||||
|
|
||||||
The intent is to **track Nextcloud's own release schedule** rather than invent
|
|
||||||
our own. In practice this means:
|
|
||||||
|
|
||||||
- **Patch releases (e.g. `32.0.x`)**: published to this recipe shortly after
|
|
||||||
upstream, ideally within 1 week. `chore(deps)` opens the PRs; a maintainer
|
|
||||||
reviews the release notes and Nextcloud's issue tracker, and merges the PR
|
|
||||||
if it is OK.
|
|
||||||
- **Minor releases**: same flow as patch releases, but one of the maintainer
|
|
||||||
tests it on their own instance before merging.
|
|
||||||
- **Major releases (e.g. `32 → 33`)**: not adopted on day one. We wait for the
|
|
||||||
first one or two upstream patch releases of the new major to land
|
|
||||||
(typically 1–2 months) before promoting it here, to avoid passing the
|
|
||||||
early-adopter cost to operators. Major bumps get their own PR with release
|
|
||||||
notes and an upgrade-path check.
|
|
||||||
Before adding a major release, the following needs to be done:
|
|
||||||
- at least two maintainers update one of their production instances to the
|
|
||||||
new version
|
|
||||||
- the previous release gets a last update pointing to the docker image
|
|
||||||
versions nextcloud:xx-fpm, so that users can auto-update if they wish so
|
|
||||||
- the new release is added to this repo
|
|
||||||
- If people have the time it would be nice to create specially tagged versions
|
|
||||||
for major releases, which reflect that this is 'bleeding edge' and has not
|
|
||||||
been thoroughly tested.
|
|
||||||
- **Co-installed components** (Talk HPB, OnlyOffice, Whiteboard, etc.) are
|
|
||||||
bumped alongside or shortly after the matching Nextcloud release.
|
|
||||||
|
|
||||||
## Pull Requests
|
|
||||||
|
|
||||||
A pull request can be merged once it is approved by at least one maintainer.
|
|
||||||
PRs opened by a maintainer need approval from another maintainer. With three
|
|
||||||
maintainers this is workable; if the group shrinks, the rule should be
|
|
||||||
revisited.
|
|
||||||
|
|
||||||
Approvals should ideally include a smoke test on a real instance for anything
|
|
||||||
beyond a patch bump — Nextcloud upgrades have a long history of surprising us
|
|
||||||
(see the [upgrade notes in `README.md`](./README.md#upgrading-nextcloud)),
|
|
||||||
and silent CI is not enough.
|
|
||||||
|
|
||||||
## Becoming a maintainer
|
|
||||||
|
|
||||||
Everyone is welcome to apply:
|
|
||||||
|
|
||||||
1. Watch the repository so you get notifications.
|
|
||||||
2. Open a pull request adding yourself to the `Maintainer` line in
|
|
||||||
[`README.md`](./README.md) and to the list above.
|
|
||||||
3. Once an existing maintainer merges the PR, you'll be added to the
|
|
||||||
[nextcloud maintainers
|
|
||||||
team](https://git.coopcloud.tech/org/coop-cloud/teams/nextcloud-maintainers).
|
|
||||||
|
|
||||||
Stepping down is symmetrical: open a PR removing yourself, and flag it in
|
|
||||||
the federation channels so the group can plan replacement before falling
|
|
||||||
below the Res. 025 floor of one named maintainer.
|
|
||||||
@@ -5,7 +5,6 @@
|
|||||||
Fully automated luxury Nextcloud via docker-swarm.
|
Fully automated luxury Nextcloud via docker-swarm.
|
||||||
|
|
||||||
<!-- metadata -->
|
<!-- metadata -->
|
||||||
* **Maintainer**: [@dannygroenewegen](https://git.coopcloud.tech/dannygroenewegen), [@ineiti](https://git.coopcloud.tech/ineiti)
|
|
||||||
* **Category**: Apps
|
* **Category**: Apps
|
||||||
* **Status**: 5
|
* **Status**: 5
|
||||||
* **Image**: [`nextcloud`](https://hub.docker.com/_/nextcloud), 4, upstream
|
* **Image**: [`nextcloud`](https://hub.docker.com/_/nextcloud), 4, upstream
|
||||||
@@ -26,9 +25,9 @@ Fully automated luxury Nextcloud via docker-swarm.
|
|||||||
|
|
||||||
### Onlyoffice Integration
|
### Onlyoffice Integration
|
||||||
|
|
||||||
First, install onlyoffice following the instructions in the
|
First install onlyoffice following the instructions in the
|
||||||
[OnlyOffice Recipe](https://recipes.coopcloud.tech/onlyoffice), and enable
|
[OnlyOffice Recipe](https://recipes.coopcloud.tech/onlyoffice), and enable
|
||||||
the JWT secret. Then configure your nextcloud instance with:
|
the JWT secret.
|
||||||
|
|
||||||
`abra app config <app-name>`
|
`abra app config <app-name>`
|
||||||
|
|
||||||
@@ -316,6 +315,20 @@ docker exec -u www-data $(docker ps -f name=foo_com_app -q) ./occ preview:pre-ge
|
|||||||
|
|
||||||
This app will improve performance of image browsing at the cost of storage space.
|
This app will improve performance of image browsing at the cost of storage space.
|
||||||
|
|
||||||
|
## Better image previews with `imaginary`
|
||||||
|
|
||||||
|
1. Run `abra app config <domain>` and uncomment the line `#COMPOSE_FILE="$COMPOSE_FILE:compose.imaginary-preview.yml"`.
|
||||||
|
2. Re-deploy the app (`abra app deploy <domain> --force`)
|
||||||
|
3. Edit `/var/www/config/config.php` and add:
|
||||||
|
|
||||||
|
```
|
||||||
|
'enabledPreviewProviders' =>
|
||||||
|
array (
|
||||||
|
0 => 'OC\\Preview\\Imaginary',
|
||||||
|
),
|
||||||
|
'preview_imaginary_url' => 'http://imaginary:9000',
|
||||||
|
```
|
||||||
|
|
||||||
## Fulltextsearch using elasticsearch
|
## Fulltextsearch using elasticsearch
|
||||||
|
|
||||||
1. Uncomment the following lines in your env file:
|
1. Uncomment the following lines in your env file:
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
export FPM_TUNE_VERSION=v5
|
export FPM_TUNE_VERSION=v5
|
||||||
export NGINX_CONF_VERSION=v8c
|
export NGINX_CONF_VERSION=v8
|
||||||
export MY_CNF_VERSION=v6
|
export MY_CNF_VERSION=v6
|
||||||
export ENTRYPOINT_VERSION=v3
|
export ENTRYPOINT_VERSION=v3
|
||||||
export ENTRYPOINT_WHITEBOARD_VERSION=v1
|
export ENTRYPOINT_WHITEBOARD_VERSION=v1
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ version: "3.8"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
elasticsearch:
|
elasticsearch:
|
||||||
image: "docker.elastic.co/elasticsearch/elasticsearch:8.19.19"
|
image: "docker.elastic.co/elasticsearch/elasticsearch:8.17.2"
|
||||||
environment:
|
environment:
|
||||||
- cluster.name=docker-cluster
|
- cluster.name=docker-cluster
|
||||||
- bootstrap.memory_lock=true
|
- bootstrap.memory_lock=true
|
||||||
@@ -29,7 +29,7 @@ services:
|
|||||||
mode: 0600
|
mode: 0600
|
||||||
|
|
||||||
searchindexer:
|
searchindexer:
|
||||||
image: nextcloud:32.0.13-fpm
|
image: nextcloud:32.0.3-fpm
|
||||||
volumes:
|
volumes:
|
||||||
- nextcloud:/var/www/html/
|
- nextcloud:/var/www/html/
|
||||||
- nextapps:/var/www/html/custom_apps:cached
|
- nextapps:/var/www/html/custom_apps:cached
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
---
|
||||||
|
version: '3.8'
|
||||||
|
services:
|
||||||
|
imaginary:
|
||||||
|
image: nextcloud/aio-imaginary:20250822_112758
|
||||||
|
environment:
|
||||||
|
- PORT=9000
|
||||||
|
command: -concurrency 50 -enable-url-source -log-level debug
|
||||||
|
networks:
|
||||||
|
- internal
|
||||||
+1
-1
@@ -9,7 +9,7 @@ services:
|
|||||||
- MYSQL_PASSWORD_FILE=/run/secrets/db_password
|
- MYSQL_PASSWORD_FILE=/run/secrets/db_password
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: "mariadb:12.3"
|
image: "mariadb:11.4"
|
||||||
environment:
|
environment:
|
||||||
- MYSQL_DATABASE=nextcloud
|
- MYSQL_DATABASE=nextcloud
|
||||||
- MYSQL_USER=nextcloud
|
- MYSQL_USER=nextcloud
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ services:
|
|||||||
- NEXTCLOUD_UPDATE=1
|
- NEXTCLOUD_UPDATE=1
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: "pgautoupgrade/pgautoupgrade:14-debian"
|
image: "postgres:13"
|
||||||
command: -c "max_connections=${MAX_DB_CONNECTIONS:-100}"
|
command: -c "max_connections=${MAX_DB_CONNECTIONS:-100}"
|
||||||
volumes:
|
volumes:
|
||||||
- "postgres:/var/lib/postgresql/data"
|
- "postgres:/var/lib/postgresql/data"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ services:
|
|||||||
- whiteboard_jwt
|
- whiteboard_jwt
|
||||||
|
|
||||||
whiteboard:
|
whiteboard:
|
||||||
image: ghcr.io/nextcloud-releases/whiteboard:v1.5.9
|
image: ghcr.io/nextcloud-releases/whiteboard:v1.5.0
|
||||||
deploy:
|
deploy:
|
||||||
labels:
|
labels:
|
||||||
- traefik.enable=true
|
- traefik.enable=true
|
||||||
|
|||||||
+5
-8
@@ -1,7 +1,7 @@
|
|||||||
version: "3.8"
|
version: "3.8"
|
||||||
services:
|
services:
|
||||||
web:
|
web:
|
||||||
image: nginx:1.31.3
|
image: nginx:1.29.4
|
||||||
depends_on:
|
depends_on:
|
||||||
- app
|
- app
|
||||||
configs:
|
configs:
|
||||||
@@ -14,7 +14,6 @@ services:
|
|||||||
- STACK_NAME
|
- STACK_NAME
|
||||||
- HSTS_ENABLED
|
- HSTS_ENABLED
|
||||||
- HSTS_PRELOAD
|
- HSTS_PRELOAD
|
||||||
- PHP_UPLOAD_LIMIT=${PHP_UPLOAD_LIMIT:-512M}
|
|
||||||
volumes:
|
volumes:
|
||||||
- nextcloud:/var/www/html/
|
- nextcloud:/var/www/html/
|
||||||
- nextapps:/var/www/html/custom_apps:cached
|
- nextapps:/var/www/html/custom_apps:cached
|
||||||
@@ -38,8 +37,6 @@ services:
|
|||||||
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
|
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.scheme=https"
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.scheme=https"
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.permanent=true"
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.permanent=true"
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-buffering.buffering.maxRequestBodyBytes=0"
|
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-buffering.buffering.memRequestBodyBytes=${MEM_REQUEST_BODY_BYTES:-1048576}"
|
|
||||||
- "caddy=${DOMAIN}"
|
- "caddy=${DOMAIN}"
|
||||||
- "caddy.reverse_proxy={{upstreams 80}}"
|
- "caddy.reverse_proxy={{upstreams 80}}"
|
||||||
- "caddy.tls.on_demand="
|
- "caddy.tls.on_demand="
|
||||||
@@ -51,7 +48,7 @@ services:
|
|||||||
start_period: 5m
|
start_period: 5m
|
||||||
|
|
||||||
app:
|
app:
|
||||||
image: nextcloud:32.0.13-fpm
|
image: nextcloud:32.0.3-fpm
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
configs:
|
configs:
|
||||||
@@ -98,7 +95,7 @@ services:
|
|||||||
failure_action: rollback
|
failure_action: rollback
|
||||||
order: start-first
|
order: start-first
|
||||||
labels:
|
labels:
|
||||||
- "coop-cloud.${STACK_NAME}.version=13.1.1+32.0.12-fpm"
|
- "coop-cloud.${STACK_NAME}.version=13.0.1+32.0.3-fpm"
|
||||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT}"
|
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT}"
|
||||||
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
|
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
|
||||||
- "backupbot.backup.volumes.redis=false"
|
- "backupbot.backup.volumes.redis=false"
|
||||||
@@ -112,7 +109,7 @@ services:
|
|||||||
start_period: 15m
|
start_period: 15m
|
||||||
|
|
||||||
cron:
|
cron:
|
||||||
image: nextcloud:32.0.13-fpm
|
image: nextcloud:32.0.3-fpm
|
||||||
volumes:
|
volumes:
|
||||||
- nextcloud:/var/www/html/
|
- nextcloud:/var/www/html/
|
||||||
- nextapps:/var/www/html/custom_apps:cached
|
- nextapps:/var/www/html/custom_apps:cached
|
||||||
@@ -128,7 +125,7 @@ services:
|
|||||||
|
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
image: redis:8.8.1-alpine
|
image: redis:8.4.0-alpine
|
||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
volumes:
|
volumes:
|
||||||
|
|||||||
+1
-5
@@ -54,7 +54,7 @@ http {
|
|||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
# set max upload size
|
# set max upload size
|
||||||
client_max_body_size {{ env "PHP_UPLOAD_LIMIT" }} ;
|
client_max_body_size 512M;
|
||||||
fastcgi_buffers 64 4K;
|
fastcgi_buffers 64 4K;
|
||||||
|
|
||||||
# Enable gzip but do not remove ETag headers
|
# Enable gzip but do not remove ETag headers
|
||||||
@@ -162,10 +162,6 @@ http {
|
|||||||
|
|
||||||
fastcgi_intercept_errors on;
|
fastcgi_intercept_errors on;
|
||||||
fastcgi_request_buffering off;
|
fastcgi_request_buffering off;
|
||||||
|
|
||||||
fastcgi_read_timeout 3600s;
|
|
||||||
fastcgi_send_timeout 3600s;
|
|
||||||
fastcgi_connect_timeout 60s;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
location ~ \.(?:css|js|svg|gif)$ {
|
location ~ \.(?:css|js|svg|gif)$ {
|
||||||
|
|||||||
@@ -1,3 +0,0 @@
|
|||||||
Important:
|
|
||||||
Posgres: Due to end of support for postgres 13 we upgraded to pgautoupgrade-14-debian but we could not test it, so please take backups before the upgrade!
|
|
||||||
Elastic Search: We chose the latest minor update for elasticsearch but we were also not able to test it.
|
|
||||||
Reference in New Issue
Block a user