Compare commits

...

6 Commits

4 changed files with 19 additions and 14 deletions

View File

@ -24,6 +24,7 @@ install_apps() {
for app in $install_apps; do for app in $install_apps; do
run_occ "app:install $app" run_occ "app:install $app"
done done
exit 0 # fails when app's already installed
} }
set_app_config() { set_app_config() {
@ -47,6 +48,10 @@ set_trusted_proxies() {
set_system_config trusted_proxies "$trusted_proxies" set_system_config trusted_proxies "$trusted_proxies"
} }
set_logfile_stdout() {
set_system_config logfile '/dev/stdout'
}
install_bbb() { install_bbb() {
install_apps bbb install_apps bbb
set_app_config bbb app.navigation true set_app_config bbb app.navigation true

View File

@ -28,9 +28,9 @@ services:
deploy: deploy:
labels: labels:
backupbot.backup: "true" backupbot.backup: "true"
backupbot.backup.pre-hook: 'mkdir -p /tmp/backup/ && mysqldump --single-transaction -u root -p"$$(cat /run/secrets/db_root_password)" nextcloud > /tmp/backup/backup.sql' backupbot.backup.pre-hook: 'mysqldump --single-transaction -u root -p"$$(cat /run/secrets/db_root_password)" nextcloud > /var/lib/mysql/backup.sql'
backupbot.backup.post-hook: "rm -rf /tmp/backup" backupbot.backup.post-hook: "rm -rf /var/lib/mysql/backup.sql"
backupbot.backup.path: "/tmp/backup/" backupbot.backup.path: "/var/lib/mysql/backup.sql"
healthcheck: healthcheck:
test: ["CMD-SHELL", 'mysqladmin -p"$$(cat /run/secrets/db_root_password)" ping'] test: ["CMD-SHELL", 'mysqladmin -p"$$(cat /run/secrets/db_root_password)" ping']
interval: 30s interval: 30s

View File

@ -16,22 +16,22 @@ services:
networks: networks:
- internal - internal
environment: environment:
POSTGRES_USER: nextcloud POSTGRES_USER: nextcloud
POSTGRES_PASSWORD_FILE: /run/secrets/db_password POSTGRES_PASSWORD_FILE: /run/secrets/db_password
POSTGRES_DB: nextcloud POSTGRES_DB: nextcloud
secrets: secrets:
- db_password - db_password
healthcheck: healthcheck:
test: ["CMD-SHELL", "pg_isready"] test: ["CMD-SHELL", "pg_isready", "-U", "nextcloud"]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 5 retries: 5
deploy: deploy:
labels: labels:
backupbot.backup: "true" backupbot.backup: "true"
backupbot.backup.pre-hook: "mkdir -p /tmp/backup/ && PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /tmp/backup/backup.sql" backupbot.backup.pre-hook: "PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /var/lib/postgresql/data/backup.sql"
backupbot.backup.post-hook: "rm -rf /tmp/backup" backupbot.backup.post-hook: "rm -rf /var/lib/postgresql/data/backup.sql"
backupbot.backup.path: "/tmp/backup/" backupbot.backup.path: "/var/lib/postgresql/data/"
volumes: volumes:
postgres: postgres:

View File

@ -1,7 +1,7 @@
version: "3.8" version: "3.8"
services: services:
web: web:
image: nginx:1.25.0 image: nginx:1.25.1
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:26.0.2-fpm image: nextcloud:27.0.0-fpm
depends_on: depends_on:
- db - db
configs: configs:
@ -86,7 +86,7 @@ services:
failure_action: rollback failure_action: rollback
order: start-first order: start-first
labels: labels:
- "coop-cloud.${STACK_NAME}.version=4.0.5+26.0.2-fpm" - "coop-cloud.${STACK_NAME}.version=5.0.0+27.0.0-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:26.0.2-fpm image: nextcloud:27.0.0-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
@ -110,7 +110,7 @@ services:
entrypoint: /cron.sh entrypoint: /cron.sh
cache: cache:
image: redis:7.0.11-alpine image: redis:7.0.12-alpine
networks: networks:
- internal - internal
volumes: volumes: