From 623f98d98922f890a9aa553cdcd7f65c516ee2ea Mon Sep 17 00:00:00 2001
From: Willy Kloucek <wkloucek@owncloud.com>
Date: Thu, 21 Jan 2021 15:58:52 +0100
Subject: [PATCH 1/2] add log rotation to deploy examples

---
 .../examples/cs3_users_ocis/docker-compose.yaml     | 11 +++++++++++
 .../examples/ocis_keycloak/docker-compose.yml       | 11 +++++++++++
 .../examples/ocis_traefik/docker-compose.yml        |  7 +++++++
 .../owncloud10_with_oc_web/docker-compose.yml       | 13 +++++++++++++
 4 files changed, 42 insertions(+)

diff --git a/deployments/examples/cs3_users_ocis/docker-compose.yaml b/deployments/examples/cs3_users_ocis/docker-compose.yaml
index 7193df4e2..8d8347fea 100644
--- a/deployments/examples/cs3_users_ocis/docker-compose.yaml
+++ b/deployments/examples/cs3_users_ocis/docker-compose.yaml
@@ -38,6 +38,11 @@ services:
       - "traefik.http.routers.traefik-secure.tls=true"
       - "traefik.http.routers.traefik-secure.tls.certresolver=http"
       - "traefik.http.routers.traefik-secure.service=api@internal"
+    logging: &logging
+      driver: "json-file"
+      options:
+        max-size: "100m"
+        max-file: "2"
     restart: always
 
   ocis:
@@ -86,6 +91,8 @@ services:
       - "traefik.http.routers.ocis-secure.service=ocis"
       - "traefik.http.services.ocis.loadbalancer.server.port=9200"
       - "traefik.http.services.ocis.loadbalancer.server.scheme=https"
+    logging:
+      <<: *logging
     restart: always
 
   ldap-server:
@@ -103,6 +110,8 @@ services:
       - "127.0.0.1:636:636"
     volumes:
       - ./config/ldap/ldif:/container/service/slapd/assets/config/bootstrap/ldif/custom
+    logging:
+      <<: *logging
     restart: always
 
   ldap-manager:
@@ -122,6 +131,8 @@ services:
       - "traefik.http.routers.ldap-manager-secure.tls.certresolver=http"
       - "traefik.http.routers.ldap-manager-secure.service=ldap-manager"
       - "traefik.http.services.ldap-manager.loadbalancer.server.port=80"
+    logging:
+      <<: *logging
     restart: always
 
 volumes:
diff --git a/deployments/examples/ocis_keycloak/docker-compose.yml b/deployments/examples/ocis_keycloak/docker-compose.yml
index 4918fa4f6..85d7ad6ed 100644
--- a/deployments/examples/ocis_keycloak/docker-compose.yml
+++ b/deployments/examples/ocis_keycloak/docker-compose.yml
@@ -39,6 +39,11 @@ services:
       - "traefik.http.routers.traefik-secure.tls=true"
       - "traefik.http.routers.traefik-secure.tls.certresolver=http"
       - "traefik.http.routers.traefik-secure.service=api@internal"
+    logging: &logging
+      driver: "json-file"
+      options:
+        max-size: "100m"
+        max-file: "2"
     restart: always
 
   ocis:
@@ -73,6 +78,8 @@ services:
       - "traefik.http.routers.ocis-secure.service=ocis"
       - "traefik.http.services.ocis.loadbalancer.server.port=9200"
       - "traefik.http.services.ocis.loadbalancer.server.scheme=https"
+    logging:
+      <<: *logging
     restart: always
 
   postgres:
@@ -83,6 +90,8 @@ services:
       POSTGRES_DB: keycloak
       POSTGRES_USER: keycloak
       POSTGRES_PASSWORD: keycloak
+    logging:
+      <<: *logging
     restart: always
 
   keycloak:
@@ -112,6 +121,8 @@ services:
       - "traefik.http.services.keycloak.loadbalancer.server.scheme=http"
     depends_on:
       - postgres
+    logging:
+      <<: *logging
     restart: always
 
 volumes:
diff --git a/deployments/examples/ocis_traefik/docker-compose.yml b/deployments/examples/ocis_traefik/docker-compose.yml
index 0326958f8..c0eaec747 100644
--- a/deployments/examples/ocis_traefik/docker-compose.yml
+++ b/deployments/examples/ocis_traefik/docker-compose.yml
@@ -38,6 +38,11 @@ services:
       - "traefik.http.routers.traefik-secure.tls=true"
       - "traefik.http.routers.traefik-secure.tls.certresolver=http"
       - "traefik.http.routers.traefik-secure.service=api@internal"
+    logging: &logging
+      driver: "json-file"
+      options:
+        max-size: "100m"
+        max-file: "2"
     restart: always
 
   ocis:
@@ -63,6 +68,8 @@ services:
       - "traefik.http.routers.ocis-secure.service=ocis"
       - "traefik.http.services.ocis.loadbalancer.server.port=9200"
       - "traefik.http.services.ocis.loadbalancer.server.scheme=https"
+    logging:
+      <<: *logging
     restart: always
 
 volumes:
diff --git a/deployments/examples/owncloud10_with_oc_web/docker-compose.yml b/deployments/examples/owncloud10_with_oc_web/docker-compose.yml
index 282b06019..64500ce11 100644
--- a/deployments/examples/owncloud10_with_oc_web/docker-compose.yml
+++ b/deployments/examples/owncloud10_with_oc_web/docker-compose.yml
@@ -38,6 +38,11 @@ services:
       - "traefik.http.routers.traefik-secure.tls=true"
       - "traefik.http.routers.traefik-secure.tls.certresolver=http"
       - "traefik.http.routers.traefik-secure.service=api@internal"
+    logging: &logging
+      driver: "json-file"
+      options:
+        max-size: "100m"
+        max-file: "2"
     restart: always
 
   ocis:
@@ -114,6 +119,8 @@ services:
       - "traefik.http.routers.ocis-secure.tls.certresolver=http"
       - "traefik.http.routers.ocis-secure.service=ocis"
       - "traefik.http.services.ocis.loadbalancer.server.port=9200"
+    logging:
+      <<: *logging
     restart: always
 
   oc10:
@@ -156,6 +163,8 @@ services:
       - "traefik.http.routers.oc10-secure.tls.certresolver=http"
       - "traefik.http.routers.oc10-secure.service=oc10"
       - "traefik.http.services.oc10.loadbalancer.server.port=8080"
+    logging:
+      <<: *logging
     restart: always
 
   db:
@@ -175,6 +184,8 @@ services:
     volumes:
       - mysql:/var/lib/mysql
       - backup:/var/lib/backup
+    logging:
+      <<: *logging
     restart: always
 
   redis:
@@ -183,6 +194,8 @@ services:
       - REDIS_DATABASES=1
     volumes:
       - redis:/var/lib/redis
+    logging:
+      <<: *logging
     restart: always
 
 

From 888bea54ad72b7b7fc97e77bead848a14548bb5e Mon Sep 17 00:00:00 2001
From: Willy Kloucek <wkloucek@owncloud.com>
Date: Fri, 22 Jan 2021 08:51:20 +0100
Subject: [PATCH 2/2] switch to local log driver

---
 .../examples/cs3_users_ocis/docker-compose.yaml   | 13 +++++--------
 .../examples/ocis_keycloak/docker-compose.yml     | 13 +++++--------
 .../examples/ocis_traefik/docker-compose.yml      |  9 +++------
 .../owncloud10_with_oc_web/docker-compose.yml     | 15 ++++++---------
 4 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/deployments/examples/cs3_users_ocis/docker-compose.yaml b/deployments/examples/cs3_users_ocis/docker-compose.yaml
index 8d8347fea..ee785f233 100644
--- a/deployments/examples/cs3_users_ocis/docker-compose.yaml
+++ b/deployments/examples/cs3_users_ocis/docker-compose.yaml
@@ -38,11 +38,8 @@ services:
       - "traefik.http.routers.traefik-secure.tls=true"
       - "traefik.http.routers.traefik-secure.tls.certresolver=http"
       - "traefik.http.routers.traefik-secure.service=api@internal"
-    logging: &logging
-      driver: "json-file"
-      options:
-        max-size: "100m"
-        max-file: "2"
+    logging:
+      driver: "local"
     restart: always
 
   ocis:
@@ -92,7 +89,7 @@ services:
       - "traefik.http.services.ocis.loadbalancer.server.port=9200"
       - "traefik.http.services.ocis.loadbalancer.server.scheme=https"
     logging:
-      <<: *logging
+      driver: "local"
     restart: always
 
   ldap-server:
@@ -111,7 +108,7 @@ services:
     volumes:
       - ./config/ldap/ldif:/container/service/slapd/assets/config/bootstrap/ldif/custom
     logging:
-      <<: *logging
+      driver: "local"
     restart: always
 
   ldap-manager:
@@ -132,7 +129,7 @@ services:
       - "traefik.http.routers.ldap-manager-secure.service=ldap-manager"
       - "traefik.http.services.ldap-manager.loadbalancer.server.port=80"
     logging:
-      <<: *logging
+      driver: "local"
     restart: always
 
 volumes:
diff --git a/deployments/examples/ocis_keycloak/docker-compose.yml b/deployments/examples/ocis_keycloak/docker-compose.yml
index 85d7ad6ed..4730f2ce0 100644
--- a/deployments/examples/ocis_keycloak/docker-compose.yml
+++ b/deployments/examples/ocis_keycloak/docker-compose.yml
@@ -39,11 +39,8 @@ services:
       - "traefik.http.routers.traefik-secure.tls=true"
       - "traefik.http.routers.traefik-secure.tls.certresolver=http"
       - "traefik.http.routers.traefik-secure.service=api@internal"
-    logging: &logging
-      driver: "json-file"
-      options:
-        max-size: "100m"
-        max-file: "2"
+    logging:
+      driver: "local"
     restart: always
 
   ocis:
@@ -79,7 +76,7 @@ services:
       - "traefik.http.services.ocis.loadbalancer.server.port=9200"
       - "traefik.http.services.ocis.loadbalancer.server.scheme=https"
     logging:
-      <<: *logging
+      driver: "local"
     restart: always
 
   postgres:
@@ -91,7 +88,7 @@ services:
       POSTGRES_USER: keycloak
       POSTGRES_PASSWORD: keycloak
     logging:
-      <<: *logging
+      driver: "local"
     restart: always
 
   keycloak:
@@ -122,7 +119,7 @@ services:
     depends_on:
       - postgres
     logging:
-      <<: *logging
+      driver: "local"
     restart: always
 
 volumes:
diff --git a/deployments/examples/ocis_traefik/docker-compose.yml b/deployments/examples/ocis_traefik/docker-compose.yml
index c0eaec747..af35d5415 100644
--- a/deployments/examples/ocis_traefik/docker-compose.yml
+++ b/deployments/examples/ocis_traefik/docker-compose.yml
@@ -38,11 +38,8 @@ services:
       - "traefik.http.routers.traefik-secure.tls=true"
       - "traefik.http.routers.traefik-secure.tls.certresolver=http"
       - "traefik.http.routers.traefik-secure.service=api@internal"
-    logging: &logging
-      driver: "json-file"
-      options:
-        max-size: "100m"
-        max-file: "2"
+    logging:
+      driver: "local"
     restart: always
 
   ocis:
@@ -69,7 +66,7 @@ services:
       - "traefik.http.services.ocis.loadbalancer.server.port=9200"
       - "traefik.http.services.ocis.loadbalancer.server.scheme=https"
     logging:
-      <<: *logging
+      driver: "local"
     restart: always
 
 volumes:
diff --git a/deployments/examples/owncloud10_with_oc_web/docker-compose.yml b/deployments/examples/owncloud10_with_oc_web/docker-compose.yml
index 64500ce11..b2de87e3a 100644
--- a/deployments/examples/owncloud10_with_oc_web/docker-compose.yml
+++ b/deployments/examples/owncloud10_with_oc_web/docker-compose.yml
@@ -38,11 +38,8 @@ services:
       - "traefik.http.routers.traefik-secure.tls=true"
       - "traefik.http.routers.traefik-secure.tls.certresolver=http"
       - "traefik.http.routers.traefik-secure.service=api@internal"
-    logging: &logging
-      driver: "json-file"
-      options:
-        max-size: "100m"
-        max-file: "2"
+    logging:
+      driver: "local"
     restart: always
 
   ocis:
@@ -120,7 +117,7 @@ services:
       - "traefik.http.routers.ocis-secure.service=ocis"
       - "traefik.http.services.ocis.loadbalancer.server.port=9200"
     logging:
-      <<: *logging
+      driver: "local"
     restart: always
 
   oc10:
@@ -164,7 +161,7 @@ services:
       - "traefik.http.routers.oc10-secure.service=oc10"
       - "traefik.http.services.oc10.loadbalancer.server.port=8080"
     logging:
-      <<: *logging
+      driver: "local"
     restart: always
 
   db:
@@ -185,7 +182,7 @@ services:
       - mysql:/var/lib/mysql
       - backup:/var/lib/backup
     logging:
-      <<: *logging
+      driver: "local"
     restart: always
 
   redis:
@@ -195,7 +192,7 @@ services:
     volumes:
       - redis:/var/lib/redis
     logging:
-      <<: *logging
+      driver: "local"
     restart: always