From 63c6a438b650b883e4fdc30207ae69527bd93f6e Mon Sep 17 00:00:00 2001
From: Willy Kloucek <wkloucek@owncloud.com>
Date: Tue, 20 Apr 2021 08:54:32 +0200
Subject: [PATCH] use official redis

---
 .drone.star                                   |  5 +--
 .../owncloud10_with_oc_web/docker-compose.yml | 34 +++++++++----------
 tests/acceptance/docker/src/redis.yml         |  5 ++-
 3 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/.drone.star b/.drone.star
index c83164299..767e8336e 100644
--- a/.drone.star
+++ b/.drone.star
@@ -1370,11 +1370,8 @@ def redis():
   return [
     {
       'name': 'redis',
-      'image': 'webhippie/redis',
+      'image': 'redis:6-alpine',
       'pull': 'always',
-      'environment': {
-        'REDIS_DATABASES': 1
-      },
     }
   ]
 
diff --git a/deployments/examples/owncloud10_with_oc_web/docker-compose.yml b/deployments/examples/owncloud10_with_oc_web/docker-compose.yml
index 7bd3d97a5..ef4303932 100644
--- a/deployments/examples/owncloud10_with_oc_web/docker-compose.yml
+++ b/deployments/examples/owncloud10_with_oc_web/docker-compose.yml
@@ -165,38 +165,38 @@ services:
     restart: always
 
   db:
-    image: webhippie/mariadb:latest
+    image: mariadb:10.5
     environment:
-      MARIADB_ROOT_PASSWORD: owncloud
-      MARIADB_USERNAME: owncloud
-      MARIADB_PASSWORD: owncloud
-      MARIADB_DATABASE: owncloud
-      MARIADB_MAX_ALLOWED_PACKET: 128M
-      MARIADB_INNODB_LOG_FILE_SIZE: 256M
+      - 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
     logging:
       driver: "local"
     restart: always
 
   redis:
-    image: webhippie/redis:latest
-    environment:
-      - REDIS_DATABASES=1
+    image: redis:6
+    command: ["--databases", "1"]
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
     volumes:
-      - redis:/var/lib/redis
+      - redis:/data
     logging:
       driver: "local"
     restart: always
 
-
-
 volumes:
   certs:
   ocis-data:
diff --git a/tests/acceptance/docker/src/redis.yml b/tests/acceptance/docker/src/redis.yml
index 7f9a0239e..8838b598f 100644
--- a/tests/acceptance/docker/src/redis.yml
+++ b/tests/acceptance/docker/src/redis.yml
@@ -1,5 +1,4 @@
 services:
   redis:
-    image: webhippie/redis
-    environment:
-      REDIS_DATABASES: 1
+    image: redis:6
+    command: ["--databases", "1"]