forked from coop-cloud/nextcloud
Compare commits
5 Commits
3.3.2+25.0
...
4.0.2+26.0
Author | SHA1 | Date | |
---|---|---|---|
b8d209e531 | |||
f48d314699 | |||
a6ea635fd4 | |||
c9b8aec108 | |||
db39e8dee6 |
20
abra.sh
20
abra.sh
@ -18,12 +18,10 @@ post_install_occ(){
|
|||||||
|
|
||||||
install_apps() {
|
install_apps() {
|
||||||
install_apps="$@"
|
install_apps="$@"
|
||||||
if [ -z "$install_apps" ]
|
if [ -z "$install_apps" ]; then
|
||||||
then
|
|
||||||
install_apps=$APPS
|
install_apps=$APPS
|
||||||
fi
|
fi
|
||||||
for app in $install_apps
|
for app in $install_apps; do
|
||||||
do
|
|
||||||
run_occ "app:install $app"
|
run_occ "app:install $app"
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
@ -35,6 +33,20 @@ set_app_config(){
|
|||||||
run_occ "config:app:set $APP $KEY --value '$VALUE'"
|
run_occ "config:app:set $APP $KEY --value '$VALUE'"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
set_system_config() {
|
||||||
|
KEY=$1
|
||||||
|
VALUE=$2
|
||||||
|
run_occ "config:system:set $KEY --value '$VALUE'"
|
||||||
|
}
|
||||||
|
|
||||||
|
set_trusted_proxies() {
|
||||||
|
trusted_proxies="$@"
|
||||||
|
if [ -z "$1" ]; then
|
||||||
|
trusted_proxies="$TRUSTED_PROXIES"
|
||||||
|
fi
|
||||||
|
set_system_config trusted_proxies "$trusted_proxies"
|
||||||
|
}
|
||||||
|
|
||||||
install_bbb() {
|
install_bbb() {
|
||||||
install_apps bbb
|
install_apps bbb
|
||||||
set_app_config bbb app.navigation true
|
set_app_config bbb app.navigation true
|
||||||
|
@ -10,7 +10,7 @@ services:
|
|||||||
- NEXTCLOUD_UPDATE=1
|
- NEXTCLOUD_UPDATE=1
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: "postgres:12"
|
image: "postgres:15"
|
||||||
volumes:
|
volumes:
|
||||||
- "postgres:/var/lib/postgresql/data"
|
- "postgres:/var/lib/postgresql/data"
|
||||||
networks:
|
networks:
|
||||||
|
10
compose.yml
10
compose.yml
@ -1,7 +1,7 @@
|
|||||||
version: "3.8"
|
version: "3.8"
|
||||||
services:
|
services:
|
||||||
web:
|
web:
|
||||||
image: nginx:1.24.0
|
image: nginx:1.25.0
|
||||||
configs:
|
configs:
|
||||||
- source: nginx_conf
|
- source: nginx_conf
|
||||||
target: /etc/nginx/nginx.conf
|
target: /etc/nginx/nginx.conf
|
||||||
@ -41,7 +41,7 @@ services:
|
|||||||
start_period: 5m
|
start_period: 5m
|
||||||
|
|
||||||
app:
|
app:
|
||||||
image: nextcloud:25.0.6-fpm
|
image: nextcloud:26.0.2-fpm
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
configs:
|
configs:
|
||||||
@ -64,7 +64,7 @@ services:
|
|||||||
- NEXTCLOUD_ADMIN_USER=${ADMIN_USER}
|
- NEXTCLOUD_ADMIN_USER=${ADMIN_USER}
|
||||||
- NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/admin_password
|
- NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/admin_password
|
||||||
- NEXTCLOUD_TRUSTED_DOMAINS=${DOMAIN}
|
- NEXTCLOUD_TRUSTED_DOMAINS=${DOMAIN}
|
||||||
- TRUSTED_PROXIES=traefik
|
- TRUSTED_PROXIES=10.0.0.0/8
|
||||||
- REDIS_HOST=cache
|
- REDIS_HOST=cache
|
||||||
- OVERWRITEPROTOCOL=https
|
- OVERWRITEPROTOCOL=https
|
||||||
- PHP_MEMORY_LIMIT=1G
|
- PHP_MEMORY_LIMIT=1G
|
||||||
@ -86,7 +86,7 @@ services:
|
|||||||
failure_action: rollback
|
failure_action: rollback
|
||||||
order: start-first
|
order: start-first
|
||||||
labels:
|
labels:
|
||||||
- "coop-cloud.${STACK_NAME}.version=3.3.2+25.0.6-fpm"
|
- "coop-cloud.${STACK_NAME}.version=4.0.2+26.0.2-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/"
|
||||||
@ -98,7 +98,7 @@ services:
|
|||||||
start_period: 5m
|
start_period: 5m
|
||||||
|
|
||||||
cron:
|
cron:
|
||||||
image: nextcloud:25.0.6-fpm
|
image: nextcloud:26.0.2-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
|
||||||
|
Reference in New Issue
Block a user