Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2a9f1ed51a |
1
.ci-testme
Normal file
1
.ci-testme
Normal file
@ -0,0 +1 @@
|
|||||||
|
cc-ci test trigger
|
||||||
@ -32,9 +32,3 @@ LETS_ENCRYPT_ENV=production
|
|||||||
#SSO_CLIENT_SECRET_VERSION=v1
|
#SSO_CLIENT_SECRET_VERSION=v1
|
||||||
#SSO_JWT_ALG=RS256
|
#SSO_JWT_ALG=RS256
|
||||||
#SSO_PLUGIN_VERSION=0.4.0
|
#SSO_PLUGIN_VERSION=0.4.0
|
||||||
|
|
||||||
## Adding OnlyOffice to cryptpad
|
|
||||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.onlyoffice.yaml"
|
|
||||||
## Enables installation of older onlyoffice versions so that older documents
|
|
||||||
## can also be loaded and converted.
|
|
||||||
#ONLYOFFICE_OLDEST=v6
|
|
||||||
|
|||||||
18
README.md
18
README.md
@ -66,23 +66,5 @@ abra app secret insert YOURAPPDOMAIN sso_client_s v1 YOUR_CLIENT_SECRET
|
|||||||
|
|
||||||
Then deploy (or redeploy) to apply: `abra app deploy YOURAPPDOMAIN --force`.
|
Then deploy (or redeploy) to apply: `abra app deploy YOURAPPDOMAIN --force`.
|
||||||
|
|
||||||
## OnlyOffice
|
|
||||||
|
|
||||||
OnlyOffice support is provided by `compose.onlyoffice.yaml`. Enable it by adding the compose file to your app config:
|
|
||||||
|
|
||||||
```
|
|
||||||
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.
|
|
||||||
|
|
||||||
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:
|
|
||||||
|
|
||||||
```
|
|
||||||
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.
|
|
||||||
|
|
||||||
[`abra`]: https://git.coopcloud.tech/coop-cloud/abra
|
[`abra`]: https://git.coopcloud.tech/coop-cloud/abra
|
||||||
[`coop-cloud/traefik`]: https://git.coopcloud.tech/coop-cloud/traefik
|
[`coop-cloud/traefik`]: https://git.coopcloud.tech/coop-cloud/traefik
|
||||||
1
abra.sh
1
abra.sh
@ -4,4 +4,3 @@ export NGINX_CONF_VERSION=v1
|
|||||||
export SSO_ENTRYPOINT_VERSION=v6
|
export SSO_ENTRYPOINT_VERSION=v6
|
||||||
export SSO_JS_VERSION=v3
|
export SSO_JS_VERSION=v3
|
||||||
export APP_CONFIG_JS_VERSION=v1
|
export APP_CONFIG_JS_VERSION=v1
|
||||||
export ONLYOFFICE_ENTRYPOINT_VERSION=v1
|
|
||||||
|
|||||||
@ -1,48 +0,0 @@
|
|||||||
version: "3.8"
|
|
||||||
|
|
||||||
services:
|
|
||||||
init-onlyoffice-dirs:
|
|
||||||
image: busybox
|
|
||||||
user: root
|
|
||||||
command:
|
|
||||||
- sh
|
|
||||||
- -eu
|
|
||||||
- -c
|
|
||||||
- |
|
|
||||||
mkdir -p /cryptpad/www/common/onlyoffice/dist /cryptpad/onlyoffice-conf
|
|
||||||
chown -R 4001:4001 \
|
|
||||||
/cryptpad/www/common/onlyoffice/dist \
|
|
||||||
/cryptpad/onlyoffice-conf
|
|
||||||
exec tail -f /dev/null
|
|
||||||
volumes:
|
|
||||||
- cryptpad_oo_dist:/cryptpad/www/common/onlyoffice/dist
|
|
||||||
- cryptpad_oo_conf:/cryptpad/onlyoffice-conf/
|
|
||||||
|
|
||||||
app:
|
|
||||||
# onlyoffice-entrypoint.sh auto-chains through /sso-entrypoint.sh if
|
|
||||||
# compose.sso.yml is also loaded, so order of COMPOSE_FILE doesn't matter.
|
|
||||||
entrypoint:
|
|
||||||
- /onlyoffice-entrypoint.sh
|
|
||||||
- /cryptpad/docker-entrypoint.sh
|
|
||||||
environment:
|
|
||||||
- "CPAD_INSTALL_ONLYOFFICE=yes"
|
|
||||||
- ONLYOFFICE_OLDEST
|
|
||||||
volumes:
|
|
||||||
- cryptpad_oo_dist:/cryptpad/www/common/onlyoffice/dist
|
|
||||||
- cryptpad_oo_conf:/cryptpad/onlyoffice-conf/
|
|
||||||
configs:
|
|
||||||
- source: onlyoffice_entrypoint
|
|
||||||
target: /onlyoffice-entrypoint.sh
|
|
||||||
mode: 0755
|
|
||||||
deploy:
|
|
||||||
labels:
|
|
||||||
- "backupbot.backup.volumes.cryptpad_oo_dist=false"
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
cryptpad_oo_dist:
|
|
||||||
cryptpad_oo_conf:
|
|
||||||
|
|
||||||
configs:
|
|
||||||
onlyoffice_entrypoint:
|
|
||||||
name: ${STACK_NAME}_onlyoffice_entrypoint_${ONLYOFFICE_ENTRYPOINT_VERSION}
|
|
||||||
file: onlyoffice-entrypoint.sh
|
|
||||||
@ -3,7 +3,7 @@ version: "3.8"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: cryptpad/cryptpad:version-2026.5.1
|
image: cryptpad/cryptpad:version-2026.2.0
|
||||||
command: ["npm", "start"]
|
command: ["npm", "start"]
|
||||||
networks:
|
networks:
|
||||||
- backend
|
- backend
|
||||||
@ -36,7 +36,7 @@ services:
|
|||||||
labels:
|
labels:
|
||||||
- "traefik.enable=false"
|
- "traefik.enable=false"
|
||||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
||||||
- "coop-cloud.${STACK_NAME}.version=0.6.0+v2026.5.1"
|
- "coop-cloud.${STACK_NAME}.version=0.5.4+v2026.2.0"
|
||||||
- "backupbot.backup=true"
|
- "backupbot.backup=true"
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "curl", "-f", "http://localhost:3000"]
|
test: ["CMD", "curl", "-f", "http://localhost:3000"]
|
||||||
@ -46,7 +46,7 @@ services:
|
|||||||
start_period: 1m
|
start_period: 1m
|
||||||
|
|
||||||
web:
|
web:
|
||||||
image: nginx:1.31
|
image: nginx:1.29
|
||||||
configs:
|
configs:
|
||||||
- source: nginx_conf
|
- source: nginx_conf
|
||||||
target: /etc/nginx/conf.d/default.conf
|
target: /etc/nginx/conf.d/default.conf
|
||||||
|
|||||||
@ -1,42 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
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.
|
|
||||||
|
|
||||||
CONF_DIR="/cryptpad/onlyoffice-conf"
|
|
||||||
PROPS="${CONF_DIR}/onlyoffice.properties"
|
|
||||||
|
|
||||||
# Wait for init-onlyoffice-dirs to chown the volumes. Swarm ignores
|
|
||||||
# depends_on, so the init sidecar and this container start in parallel.
|
|
||||||
waited=0
|
|
||||||
while [ ! -w "${CONF_DIR}" ]; do
|
|
||||||
if [ "${waited}" -ge 60 ]; then
|
|
||||||
echo "[onlyoffice-entrypoint] timed out waiting for ${CONF_DIR} to become writable" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
echo "[onlyoffice-entrypoint] waiting for ${CONF_DIR} to be writable (${waited}s)"
|
|
||||||
sleep 1
|
|
||||||
waited=$((waited + 1))
|
|
||||||
done
|
|
||||||
|
|
||||||
if [ -n "${ONLYOFFICE_OLDEST:-}" ]; then
|
|
||||||
mkdir -p "${CONF_DIR}"
|
|
||||||
touch "${PROPS}"
|
|
||||||
if grep -q '^oldest_needed_version=' "${PROPS}"; then
|
|
||||||
sed -i "s|^oldest_needed_version=.*|oldest_needed_version=${ONLYOFFICE_OLDEST}|" "${PROPS}"
|
|
||||||
else
|
|
||||||
echo "oldest_needed_version=${ONLYOFFICE_OLDEST}" >> "${PROPS}"
|
|
||||||
fi
|
|
||||||
echo "[onlyoffice-entrypoint] oldest_needed_version=${ONLYOFFICE_OLDEST}"
|
|
||||||
else
|
|
||||||
echo "[onlyoffice-entrypoint] ONLYOFFICE_OLDEST unset, leaving ${PROPS} untouched"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Chain through the SSO entrypoint if compose.sso.yml mounted it.
|
|
||||||
if [ -x /sso-entrypoint.sh ]; then
|
|
||||||
exec /sso-entrypoint.sh "$@"
|
|
||||||
fi
|
|
||||||
|
|
||||||
exec "$@"
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
{
|
|
||||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
|
||||||
"extends": [
|
|
||||||
"config:recommended"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user