1 files changed, 16 insertions(+), 18 deletions(-)

M docker-compose.yml

@@ 40,33 40,31 @@ services:
       - files:/mnt/data
 
   db:
-    image: webhippie/mariadb:latest
+    image: mariadb:10.5
     restart: always
     environment:
-      - MARIADB_ROOT_PASSWORD=owncloud
-      - MARIADB_USERNAME=owncloud
-      - MARIADB_PASSWORD=owncloud
-      - MARIADB_DATABASE=owncloud
-      - MARIADB_MAX_ALLOWED_PACKET=128M
-      - MARIADB_INNODB_LOG_FILE_SIZE=64M
+      - MYSQL_ROOT_PASSWORD=owncloud
+      - MYSQL_USER=owncloud
+      - MYSQL_PASSWORD=owncloud
+      - MYSQL_DATABASE=owncloud
+    command: ["--max-allowed-packet=128M", "--innodb-log-file-size=64M"]
     healthcheck:
-      test: ["CMD", "/usr/bin/healthcheck"]
-      interval: 30s
-      timeout: 10s
+      test: ["CMD", "mysqladmin", "ping", "-u", "root", "--password=owncloud"]
+      interval: 10s
+      timeout: 5s
       retries: 5
     volumes:
       - mysql:/var/lib/mysql
-      - backup:/var/lib/backup
 
   redis:
-    image: webhippie/redis:latest
+    image: redis:6
+    container_name: owncloud_redis
     restart: always
-    environment:
-      - REDIS_DATABASES=1
+    command: ["--databases", "1"]
     healthcheck:
-      test: ["CMD", "/usr/bin/healthcheck"]
-      interval: 30s
-      timeout: 10s
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 5s
       retries: 5
     volumes:
-      - redis:/var/lib/redis
+      - redis:/data