coop-cloud/cryptpad
1
0
Fork 3
Code Issues 1 Pull Requests 2 Projects Releases Wiki Activity

Moving to 2026.10.0

Browse Source 
This is only a test.
This commit is contained in:
Linus Gasser
2026-10-24 01:11:08 +02:00
parent 36ee3451a3
commit cbe8c1d5b4
9 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.sample
+1 -1
View File
@@ -31,7 +31,7 @@ LETS_ENCRYPT_ENV=production
#SSO_CLIENT_ID=cryptpad
#SSO_CLIENT_SECRET_VERSION=v1
#SSO_JWT_ALG=RS256
#SSO_PLUGIN_VERSION=0.4.0
#SSO_PLUGIN_VERSION=1.0.0
## Adding OnlyOffice to cryptpad
#COMPOSE_FILE="$COMPOSE_FILE:compose.onlyoffice.yaml"
README.md
+3 -3
View File
@@ -74,15 +74,15 @@ OnlyOffice support is provided by `compose.onlyoffice.yaml`. Enable it by adding
COMPOSE_FILE="compose.yml:compose.onlyoffice.yaml"
```
On the next deploy, an entrypoint wrapper (`onlyoffice-entrypoint.sh`) prepares the OnlyOffice config volume **before** CryptPad starts, then the app container runs `install-onlyoffice.sh` to download the OnlyOffice assets. Running the prep work inside the app container (rather than a separate init service) is necessary because Docker Swarm ignores `depends_on` at runtime — a sidecar init container would race the app.
On the next deploy, an entrypoint wrapper (`onlyoffice-entrypoint.sh`) prepares the OnlyOffice config volume **before** CryptPad starts, then the app container runs `install-office.sh` to download the OnlyOffice assets. Running the prep work inside the app container (rather than a separate init service) is necessary because Docker Swarm ignores `depends_on` at runtime — a sidecar init container would race the app.
To support opening documents created with older OnlyOffice versions, set `ONLYOFFICE_OLDEST` in your app config. This writes (or updates) `oldest_needed_version` in `onlyoffice-conf/onlyoffice.properties`, which `install-onlyoffice.sh` reads to fetch older versions in addition to the latest:
To support opening documents created with older OnlyOffice versions, set `ONLYOFFICE_OLDEST` in your app config. This writes (or updates) `oldest_needed_version` in `onlyoffice-conf/onlyoffice.properties`, which `install-office.sh` reads to fetch older versions in addition to the latest:
```
ONLYOFFICE_OLDEST=v6
```
If `ONLYOFFICE_OLDEST` is unset, `onlyoffice.properties` is left untouched (CryptPad's own default applies). Only the `oldest_needed_version` key is touched on each deploy, so any other entries in `onlyoffice.properties` are preserved. If you change `ONLYOFFICE_OLDEST` after the assets have already been downloaded, you may need to drop the `cryptpad_oo_dist` volume so `install-onlyoffice.sh` re-runs and pulls the additional versions.
If `ONLYOFFICE_OLDEST` is unset, `onlyoffice.properties` is left untouched (CryptPad's own default applies). Only the `oldest_needed_version` key is touched on each deploy, so any other entries in `onlyoffice.properties` are preserved. If you change `ONLYOFFICE_OLDEST` after the assets have already been downloaded, you may need to drop the `cryptpad_oo_dist` volume so `install-office.sh` re-runs and pulls the additional versions.
[`abra`]: https://git.coopcloud.tech/coop-cloud/abra
[`coop-cloud/traefik`]: https://git.coopcloud.tech/coop-cloud/traefik
abra.sh
+4 -4
View File
@@ -1,7 +1,7 @@
export CONFIG_VERSION=v2
export CONFIG_VERSION=v3
export CONFIG_JS_VERSION=v2
export NGINX_CONF_VERSION=v1
export SSO_ENTRYPOINT_VERSION=v6
export NGINX_CONF_VERSION=v2
export SSO_ENTRYPOINT_VERSION=v7
export SSO_JS_VERSION=v3
export APP_CONFIG_JS_VERSION=v1
export ONLYOFFICE_ENTRYPOINT_VERSION=v1
export ONLYOFFICE_ENTRYPOINT_VERSION=v2
compose.yml
+4 -4
View File
@@ -3,14 +3,14 @@ version: "3.8"
services:
app:
image: cryptpad/cryptpad:version-2026.5.1
image: cryptpad/cryptpad:version-2026.10.0
command: ["npm", "start"]
networks:
- backend
environment:
- CRYPTPAD_ADMIN_KEYS
- "CPAD_MAIN_DOMAIN=${DOMAIN}"
- "CPAD_SANDBOX_DOMAIN=${SANDBOX_DOMAIN}"
- "CPAD_MAIN_DOMAIN=https://${DOMAIN}"
- "CPAD_SANDBOX_DOMAIN=https://${SANDBOX_DOMAIN}"
# Traefik can't use HTTP2 to communicate with cryptpad_websocket
# A workaroung is disabling HTTP2 in Nginx
- "CPAD_HTTP2_DISABLE=true"
@@ -36,7 +36,7 @@ services:
labels:
- "traefik.enable=false"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
- "coop-cloud.${STACK_NAME}.version=0.6.0+v2026.5.1"
- "coop-cloud.${STACK_NAME}.version=1.0.0+v2026.10.0"
- "backupbot.backup=true"
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000"]
config.js.tmpl
+2 -2
View File
@@ -46,7 +46,7 @@ module.exports = {
* cryptpad/docs/example.nginx.conf (see the $main_domain variable)
*
*/
httpUnsafeOrigin: 'https://{{ env "CPAD_MAIN_DOMAIN" }}',
httpUnsafeOrigin: '{{ env "CPAD_MAIN_DOMAIN" }}',
/* httpSafeOrigin is the URL that is used for the 'sandbox' described above.
* If you're testing or developing with CryptPad on your local machine then
@@ -67,7 +67,7 @@ module.exports = {
*
* CUSTOMIZE AND UNCOMMENT THIS FOR PRODUCTION INSTALLATIONS.
*/
httpSafeOrigin: 'https://{{ env "CPAD_SANDBOX_DOMAIN" }}',
httpSafeOrigin: '{{ env "CPAD_SANDBOX_DOMAIN" }}',
/* httpAddress specifies the address on which the nodejs server
* should be accessible. By default it will listen on 127.0.0.1
nginx.conf.tmpl
+1 -1
View File
@@ -25,7 +25,7 @@ server {
# WebSocket endpoint
location ^~ /cryptpad_websocket {
proxy_pass http://{{ env "STACK_NAME" }}_app:3003;
proxy_pass http://{{ env "STACK_NAME" }}_app:3000;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
onlyoffice-entrypoint.sh
+1 -1
View File
@@ -3,7 +3,7 @@ set -e
# OnlyOffice init — runs before the original CryptPad entrypoint.
# Ensures oldest_needed_version in onlyoffice.properties matches
# ONLYOFFICE_OLDEST before install-onlyoffice.sh / CryptPad reads it.
# ONLYOFFICE_OLDEST before install-office.sh / CryptPad reads it.
CONF_DIR="/cryptpad/onlyoffice-conf"
PROPS="${CONF_DIR}/onlyoffice.properties"
release/1.0.0+v2026.10.0
+15
View File
@@ -0,0 +1,15 @@
CryptPad 2026.10.0 ships a rewritten server (cryptpad-server). Upstream notes:
https://github.com/cryptpad/cryptpad/releases/tag/2026.10.0
Recipe changes:
- The websocket is now served on the main HTTP port (3000); the bundled nginx
config is updated (NGINX_CONF_VERSION=v2).
- CPAD_MAIN_DOMAIN / CPAD_SANDBOX_DOMAIN now include the https:// scheme, as
the new server reads them directly. Nothing to change in your .env.
- On first start the image creates config/infra.js from the example; the
origins, bind address and ports are taken from the env vars above.
- Office apps are now based on Euro-Office 9.3 (install-office.sh). Existing
OnlyOffice deployments keep working; new assets are downloaded on start.
- SSO: the plugin must be upgraded to 1.0.0. If your .env pins
SSO_PLUGIN_VERSION to an older version, set SSO_PLUGIN_VERSION=1.0.0.
The plugin's npm dependencies are now installed by sso-entrypoint.sh.
sso-entrypoint.sh
+6 -1
View File
@@ -13,7 +13,7 @@ fi
PLUGIN_DIR="/cryptpad/lib/plugins/sso"
VERSION_FILE="${PLUGIN_DIR}/.version"
SSO_PLUGIN_VERSION="${SSO_PLUGIN_VERSION:-0.4.0}"
SSO_PLUGIN_VERSION="${SSO_PLUGIN_VERSION:-1.0.0}"
# Copy SSO config template into place (mounted as Docker config)
if [ -f /sso.js ]; then
@@ -29,6 +29,11 @@ else
rm -rf "${PLUGIN_DIR}"
git clone --depth 1 --branch "${SSO_PLUGIN_VERSION}" \
https://github.com/cryptpad/sso.git "${PLUGIN_DIR}"
# Since CryptPad 2026.10.0 the plugin's dependencies (openid-client,
# node-saml, ...) are no longer bundled with CryptPad itself.
if [ -f "${PLUGIN_DIR}/package.json" ]; then
(cd "${PLUGIN_DIR}" && npm ci --omit=dev)
fi
echo "${SSO_PLUGIN_VERSION}" > "${VERSION_FILE}"
echo "[sso-entrypoint] SSO plugin installed"
fi