forked from coop-cloud/nextcloud
Compare commits
8 Commits
6.0.2+28.0
...
7.0.1+29.0
Author | SHA1 | Date | |
---|---|---|---|
ce817e3928 | |||
7a64d3c6a7 | |||
bb781e654b | |||
cb5cd5f7b2 | |||
0a3e943b26 | |||
4f1aaf5d1d | |||
019b71fde1 | |||
7527399da0 |
3
abra.sh
3
abra.sh
@ -1,9 +1,10 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
export FPM_TUNE_VERSION=v5
|
export FPM_TUNE_VERSION=v5
|
||||||
export NGINX_CONF_VERSION=v5
|
export NGINX_CONF_VERSION=v6
|
||||||
export MY_CNF_VERSION=v5
|
export MY_CNF_VERSION=v5
|
||||||
export ENTRYPOINT_VERSION=v3
|
export ENTRYPOINT_VERSION=v3
|
||||||
|
export CRONTAB_VERSION=v1
|
||||||
|
|
||||||
run_occ() {
|
run_occ() {
|
||||||
su -p www-data -s /bin/sh -c "/var/www/html/occ $@"
|
su -p www-data -s /bin/sh -c "/var/www/html/occ $@"
|
||||||
|
23
alaconnect.yml
Normal file
23
alaconnect.yml
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
authentik:
|
||||||
|
uncomment:
|
||||||
|
- compose.authentik.yml
|
||||||
|
- AUTHENTIK_USER_PREFIX
|
||||||
|
- AUTHENTIK_DOMAIN
|
||||||
|
- SECRET_AUTHENTIK_SECRET_VERSION
|
||||||
|
- SECRET_AUTHENTIK_ID_VERSION
|
||||||
|
execute:
|
||||||
|
- app set_authentik
|
||||||
|
shared_secrets:
|
||||||
|
nextcloud_secret: authentik_secret
|
||||||
|
nextcloud_id: authentik_id
|
||||||
|
onlyoffice:
|
||||||
|
uncomment:
|
||||||
|
- ONLYOFFICE_URL
|
||||||
|
- SECRET_ONLYOFFICE_JWT_VERSION
|
||||||
|
execute:
|
||||||
|
- app install_onlyoffice
|
||||||
|
collabora:
|
||||||
|
uncomment:
|
||||||
|
- COLLABORA_URL
|
||||||
|
execute:
|
||||||
|
- app install_collabora
|
@ -2,7 +2,7 @@ version: "3.8"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
elasticsearch:
|
elasticsearch:
|
||||||
image: "docker.elastic.co/elasticsearch/elasticsearch:8.11.3"
|
image: "docker.elastic.co/elasticsearch/elasticsearch:8.11.4"
|
||||||
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:28.0.5-fpm
|
image: nextcloud:29.0.1-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
|
||||||
|
17
compose.yml
17
compose.yml
@ -1,7 +1,7 @@
|
|||||||
version: "3.8"
|
version: "3.8"
|
||||||
services:
|
services:
|
||||||
web:
|
web:
|
||||||
image: nginx:1.25.3
|
image: nginx:1.26.1
|
||||||
depends_on:
|
depends_on:
|
||||||
- app
|
- app
|
||||||
configs:
|
configs:
|
||||||
@ -46,7 +46,7 @@ services:
|
|||||||
start_period: 5m
|
start_period: 5m
|
||||||
|
|
||||||
app:
|
app:
|
||||||
image: nextcloud:28.0.5-fpm
|
image: nextcloud:29.0.1-fpm
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
configs:
|
configs:
|
||||||
@ -91,7 +91,7 @@ services:
|
|||||||
failure_action: rollback
|
failure_action: rollback
|
||||||
order: start-first
|
order: start-first
|
||||||
labels:
|
labels:
|
||||||
- "coop-cloud.${STACK_NAME}.version=6.0.2+28.0.5-fpm"
|
- "coop-cloud.${STACK_NAME}.version=7.0.1+29.0.1-fpm"
|
||||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
||||||
- "backupbot.backup=true"
|
- "backupbot.backup=true"
|
||||||
- "backupbot.backup.path=/var/www/html/config/,/var/www/html/data/,/var/www/html/custom_apps/"
|
- "backupbot.backup.path=/var/www/html/config/,/var/www/html/data/,/var/www/html/custom_apps/"
|
||||||
@ -103,7 +103,7 @@ services:
|
|||||||
start_period: 15m
|
start_period: 15m
|
||||||
|
|
||||||
cron:
|
cron:
|
||||||
image: nextcloud:28.0.5-fpm
|
image: nextcloud:29.0.1-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
|
||||||
@ -113,9 +113,13 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
entrypoint: /cron.sh
|
entrypoint: /cron.sh
|
||||||
|
configs:
|
||||||
|
- source: crontab
|
||||||
|
target: /var/spool/cron/crontabs/www-data
|
||||||
|
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
image: redis:7.2.4-alpine
|
image: redis:7.2.5-alpine
|
||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
volumes:
|
volumes:
|
||||||
@ -155,6 +159,9 @@ configs:
|
|||||||
name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
|
name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
|
||||||
file: entrypoint.sh.tmpl
|
file: entrypoint.sh.tmpl
|
||||||
template_driver: golang
|
template_driver: golang
|
||||||
|
crontab:
|
||||||
|
name: ${STACK_NAME}_crontab_${CRONTAB_VERSION}
|
||||||
|
file: crontab
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
proxy:
|
proxy:
|
||||||
|
1
crontab
Normal file
1
crontab
Normal file
@ -0,0 +1 @@
|
|||||||
|
*/5 * * * * php -d memory_limit=1G -f /var/www/html/cron.php
|
@ -11,6 +11,10 @@ events {
|
|||||||
|
|
||||||
http {
|
http {
|
||||||
include /etc/nginx/mime.types;
|
include /etc/nginx/mime.types;
|
||||||
|
# See https://github.com/nextcloud/forms/issues/1838#issuecomment-1860497200
|
||||||
|
types {
|
||||||
|
application/javascript js mjs;
|
||||||
|
}
|
||||||
default_type application/octet-stream;
|
default_type application/octet-stream;
|
||||||
|
|
||||||
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
|
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
|
||||||
|
Reference in New Issue
Block a user