refactored redis implementation

roles/docker-attendize/templates/docker-compose.yml.j2

@@ -31,7 +31,9 @@ services:
     image: maildev/maildev
     ports:
       - "{{ mail_interface_http_port }}:1080"
-  redis:
+
-    image: redis
+{% include 'templates/docker-redis-service.yml.j2' %}
+
 volumes:
-  database:
+  database:
+  redis:

roles/docker-funkwhale/templates/docker-compose.yml.j2

@@ -10,12 +10,9 @@ services:
     volumes:
       - database:/var/lib/postgresql/data
 
-  redis:
+{% include 'templates/docker-redis-service.yml.j2' %}
-    restart: always
+
     env_file: .env
-    image: redis:7-alpine
-    volumes:
-      - redis:/data
 
   celeryworker:
     restart: always

roles/docker-mailu/templates/docker-compose.yml.j2

@@ -2,20 +2,9 @@ version: '2.2'
 
 services:
 
-  # External dependencies
+{% include 'templates/docker-redis-service.yml.j2' %}
-  redis:
+
-    image: redis:alpine
-    restart: always
     env_file: mailu.env
-    volumes:
-      - "redis_data:/data"
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 1s
-      timeout: 3s
-      retries: 30
-    logging:
-      driver: journald
     depends_on:
       - resolver
     dns:
@@ -223,7 +212,7 @@ volumes:
   filter:
   dkim:
   dovecot_mail:
-  redis_data:
+  redis:
 networks:
   default:
     driver: bridge

roles/docker-mastodon/templates/docker-compose.yml.j2

@@ -14,17 +14,12 @@ services:
       - 'POSTGRES_HOST_AUTH_METHOD=trust'
     logging:
       driver: journald
-  redis:
+
-    restart: always
+{% include 'templates/docker-redis-service.yml.j2' %}
-    image: redis:7-alpine
+
     networks:
       - internal_network
-    healthcheck:
+
-      test: ['CMD', 'redis-cli', 'ping']
-    volumes:
-      - redis:/data
-    logging:
-      driver: journald
   web:
     image: tootsuite/mastodon:{{version_mastodon}}
     restart: always

roles/docker-nextcloud/templates/docker-compose.yml.j2

@@ -47,18 +47,9 @@ services:
         - "{{path_docker_volumes}}nextcloud/nginx.conf:/etc/nginx/nginx.conf:ro"
     volumes_from:
       - application
-  redis:
+
-    image: redis:alpine
+{% include 'templates/docker-redis-service.yml.j2' %}
-    restart: always
+
-    logging:
-      driver: journald
-    volumes:
-      - redis:/data
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 1s
-      timeout: 3s
-      retries: 30
   cron:
     image: "nextcloud:{{version_nextcloud}}-fpm-alpine"
     restart: always

roles/docker-peertube/templates/docker-compose.yml.j2

@@ -28,11 +28,9 @@ services:
       interval: 10s
       timeout: 5s
       retries: 6
-  redis:
+
-    image: redis:alpine
+{% include 'templates/docker-redis-service.yml.j2' %}
-    volumes:
+
-      - redis:/data
-    restart: "always"
     env_file:
       - .env
 volumes:

roles/docker-pixelfed/README.md

@@ -93,7 +93,7 @@ docker-compose exec -u "www-data" application php artisan schedule:run
 For a hard reset, which will delete all data and stop all services, use the following commands:
 ```bash
 docker-compose down
-docker volume rm pixelfed_application_data pixelfed_database pixelfed_redis_data
+docker volume rm pixelfed_application_data pixelfed_database pixelfed_redis
 ```
 
 ## Update Procedure

roles/docker-pixelfed/templates/docker-compose.yml.j2

@@ -41,20 +41,10 @@ services:
 
 {% include 'templates/docker-mariadb-service.yml.j2' %}
 
-  redis:
+{% include 'templates/docker-redis-service.yml.j2' %}
-    image: redis:alpine
+
-    restart: always
-    logging:
-      driver: journald
-    volumes:
-      - redis_data:/data
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 1s
-      timeout: 3s
-      retries: 30
 volumes:
   database:
-  redis_data:
+  redis:
   application_data:
   bootstrap:

templates/docker-redis-service.yml.j2

@@ -0,0 +1,12 @@
+  redis:
+    image: redis:alpine
+    restart: always
+    logging:
+      driver: journald
+    volumes:
+      - redis:/data
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 1s
+      timeout: 3s
+      retries: 30