Merge branch 'master' into disable_traefik_dashboard_for_deployment_e…

…xamples
owncloud · Jan 23, 2021 · eac9e11 · eac9e11
2 parents 2575465 + eb634d2
commit eac9e11
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 0 deletions.
diff --git a/deployments/examples/cs3_users_ocis/docker-compose.yaml b/deployments/examples/cs3_users_ocis/docker-compose.yaml
@@ -38,6 +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:
+      driver: "local"
     restart: always
 
   ocis:
@@ -86,6 +88,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:
+      driver: "local"
     restart: always
 
   ldap-server:
@@ -103,6 +107,8 @@ services:
       - "127.0.0.1:636:636"
     volumes:
       - ./config/ldap/ldif:/container/service/slapd/assets/config/bootstrap/ldif/custom
+    logging:
+      driver: "local"
     restart: always
 
   ldap-manager:
@@ -122,6 +128,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:
+      driver: "local"
     restart: always
 
 volumes:

diff --git a/deployments/examples/ocis_keycloak/docker-compose.yml b/deployments/examples/ocis_keycloak/docker-compose.yml
@@ -39,6 +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:
+      driver: "local"
     restart: always
 
   ocis:
@@ -73,6 +75,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:
+      driver: "local"
     restart: always
 
   postgres:
@@ -83,6 +87,8 @@ services:
       POSTGRES_DB: keycloak
       POSTGRES_USER: keycloak
       POSTGRES_PASSWORD: keycloak
+    logging:
+      driver: "local"
     restart: always
 
   keycloak:
@@ -112,6 +118,8 @@ services:
       - "traefik.http.services.keycloak.loadbalancer.server.scheme=http"
     depends_on:
       - postgres
+    logging:
+      driver: "local"
     restart: always
 
 volumes:

diff --git a/deployments/examples/ocis_traefik/docker-compose.yml b/deployments/examples/ocis_traefik/docker-compose.yml
@@ -38,6 +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:
+      driver: "local"
     restart: always
 
   ocis:
@@ -63,6 +65,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:
+      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
@@ -38,6 +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:
+      driver: "local"
     restart: always
 
   ocis:
@@ -114,6 +116,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:
+      driver: "local"
     restart: always
 
   oc10:
@@ -156,6 +160,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:
+      driver: "local"
     restart: always
 
   db:
@@ -175,6 +181,8 @@ services:
     volumes:
       - mysql:/var/lib/mysql
       - backup:/var/lib/backup
+    logging:
+      driver: "local"
     restart: always
 
   redis:
@@ -183,6 +191,8 @@ services:
       - REDIS_DATABASES=1
     volumes:
       - redis:/var/lib/redis
+    logging:
+      driver: "local"
     restart: always