forked from coop-cloud/nextcloud
Compare commits
9
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
119842bb1a
|
||
|
|
802f759880
|
||
|
|
0f15315dd4
|
||
|
|
267f3cbb78 | ||
|
|
b0c4f06af1 | ||
|
|
750477a409 | ||
|
|
7a7da21544 | ||
|
|
d72a8fdcdb | ||
|
|
7aa4e15034 |
+1
-1
@@ -45,7 +45,7 @@ steps:
|
||||
from_secret: drone_abra-bot_token
|
||||
fork: true
|
||||
repositories:
|
||||
- coop-cloud/auto-recipes-catalogue-json
|
||||
- toolshed/auto-recipes-catalogue-json
|
||||
|
||||
trigger:
|
||||
event: tag
|
||||
|
||||
@@ -158,3 +158,7 @@ set_windowsfriendly_filenames() {
|
||||
run_occ 'config:system:set forbidden_filename_characters 5 --value=\|'
|
||||
run_occ 'config:system:set forbidden_filename_characters 6 --value=\"'
|
||||
}
|
||||
|
||||
upgrade_mariadb() {
|
||||
mariadb-upgrade -p`cat /run/secrets/db_root_password`
|
||||
}
|
||||
@@ -2,7 +2,7 @@ version: "3.8"
|
||||
|
||||
services:
|
||||
elasticsearch:
|
||||
image: "docker.elastic.co/elasticsearch/elasticsearch:8.17.0"
|
||||
image: "docker.elastic.co/elasticsearch/elasticsearch:8.17.2"
|
||||
environment:
|
||||
- cluster.name=docker-cluster
|
||||
- bootstrap.memory_lock=true
|
||||
@@ -29,7 +29,7 @@ services:
|
||||
mode: 0600
|
||||
|
||||
searchindexer:
|
||||
image: nextcloud:30.0.4-fpm
|
||||
image: nextcloud:30.0.6-fpm
|
||||
volumes:
|
||||
- nextcloud:/var/www/html/
|
||||
- nextapps:/var/www/html/custom_apps:cached
|
||||
|
||||
+4
-4
@@ -9,7 +9,7 @@ services:
|
||||
- MYSQL_PASSWORD_FILE=/run/secrets/db_password
|
||||
|
||||
db:
|
||||
image: "mariadb:10.5"
|
||||
image: "mariadb:10.3.39"
|
||||
environment:
|
||||
- MYSQL_DATABASE=nextcloud
|
||||
- MYSQL_USER=nextcloud
|
||||
@@ -28,11 +28,11 @@ services:
|
||||
- internal
|
||||
deploy:
|
||||
labels:
|
||||
backupbot.backup.pre-hook: 'mysqldump --single-transaction -u root -p"$$(cat /run/secrets/db_root_password)" nextcloud > /var/lib/mysql/backup.sql'
|
||||
backupbot.backup.pre-hook: 'mariadb-dump --single-transaction -u root -p"$$(cat /run/secrets/db_root_password)" nextcloud > /var/lib/mysql/backup.sql'
|
||||
backupbot.backup.volumes.mariadb.path: "backup.sql"
|
||||
backupbot.restore.post-hook: 'mysql -u root -p"$$(cat /run/secrets/db_root_password)" nextcloud < /var/lib/mysql/backup.sql'
|
||||
backupbot.restore.post-hook: 'mariadb -u root -p"$$(cat /run/secrets/db_root_password)" nextcloud < /var/lib/mysql/backup.sql'
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", 'mysqladmin -p"$$(cat /run/secrets/db_root_password)" ping']
|
||||
test: ["CMD-SHELL", 'mariadb-admin -p"$$(cat /run/secrets/db_root_password)" ping']
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 10
|
||||
|
||||
+5
-5
@@ -1,7 +1,7 @@
|
||||
version: "3.8"
|
||||
services:
|
||||
web:
|
||||
image: nginx:1.27.2
|
||||
image: nginx:1.27.4
|
||||
depends_on:
|
||||
- app
|
||||
configs:
|
||||
@@ -46,7 +46,7 @@ services:
|
||||
start_period: 5m
|
||||
|
||||
app:
|
||||
image: nextcloud:30.0.4-fpm
|
||||
image: nextcloud:23.0.6-fpm
|
||||
depends_on:
|
||||
- db
|
||||
configs:
|
||||
@@ -91,7 +91,7 @@ services:
|
||||
failure_action: rollback
|
||||
order: start-first
|
||||
labels:
|
||||
- "coop-cloud.${STACK_NAME}.version=10.0.0+30.0.4-fpm"
|
||||
- "coop-cloud.${STACK_NAME}.version=11.1.0+23.0.6-fpm"
|
||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
||||
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
|
||||
- "backupbot.backup.volumes.redis=false"
|
||||
@@ -105,7 +105,7 @@ services:
|
||||
start_period: 15m
|
||||
|
||||
cron:
|
||||
image: nextcloud:30.0.4-fpm
|
||||
image: nextcloud:30.0.6-fpm
|
||||
volumes:
|
||||
- nextcloud:/var/www/html/
|
||||
- nextapps:/var/www/html/custom_apps:cached
|
||||
@@ -121,7 +121,7 @@ services:
|
||||
|
||||
|
||||
cache:
|
||||
image: redis:7.4.1-alpine
|
||||
image: redis:7.4.2-alpine
|
||||
networks:
|
||||
- internal
|
||||
volumes:
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
Upgrades mariadb from 10.5 to 11.4
|
||||
NOTE: If your Nextcloud instance is using mariadb, after running this update you MUST run the database upgrade command:
|
||||
`abra app command nextcloud.yourserver.org db upgrade_mariadb`
|
||||
More info: https://mariadb.com/kb/en/upgrading-from-mariadb-10-11-to-mariadb-11-4/
|
||||
Reference in New Issue
Block a user