make testing for the parallel deployment optional and introduce the basic auth option for all supported deployments

deployments/examples/oc10_ocis_parallel/.env

@@ -58,3 +58,8 @@ KEYCLOAK_ADMIN_PASSWORD=
 # you need uncomment following line. Please see documentation at
 # https://owncloud.dev/ocis/deployment/monitoring-tracing/
 #COMPOSE_FILE=docker-compose.yml:monitoring_tracing/docker-compose-additions.yml
+
+# If you want to use the testsuite with this stack,
+# you need uncomment following line. Please see documentation at
+# https://owncloud.dev/ocis/development/testing/
+#COMPOSE_FILE=docker-compose.yml:testing/docker-compose-additions.yml

deployments/examples/oc10_ocis_parallel/config/oc10/10-custom-config.sh

@@ -37,9 +37,4 @@ gomplate \
 occ market:upgrade --major web
 occ app:enable web
 
-# enable testing app
-echo "Cloning and enabling testing app..."
-git clone --depth 1 https://github.com/owncloud/testing.git /var/www/owncloud/apps/testing
-occ app:enable testing
-
 true

deployments/examples/oc10_ocis_parallel/config/oc10/11-testing-app.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# enable testing app
+echo "Cloning and enabling testing app..."
+git clone --depth 1 https://github.com/owncloud/testing.git /var/www/owncloud/apps/testing
+occ app:enable testing
+
+true

deployments/examples/oc10_ocis_parallel/docker-compose.yml

@@ -123,6 +123,7 @@ services:
       OCIS_MACHINE_AUTH_API_KEY: ${OCIS_MACHINE_AUTH_API_KEY:-change-me-please}
       # INSECURE: needed if oCIS / Traefik is using self generated certificates
       OCIS_INSECURE: "${INSECURE:-false}"
+      # basic auth (not recommended, but needed for eg. WebDav clients that do not support OpenID Connect)
       PROXY_ENABLE_BASIC_AUTH: "${PROXY_ENABLE_BASIC_AUTH:-false}"
     volumes:
       - ./config/ocis/proxy.json:/etc/ocis/proxy.json
@@ -144,8 +145,6 @@ services:
     image: owncloud/server:${OC10_DOCKER_TAG:-latest}
     networks:
       ocis-net:
-    ports:
-      - 8080:8080
     environment:
       # make ownCloud Web the default frontend
       OWNCLOUD_DEFAULT_APP: ${OWNCLOUD_DEFAULT_APP:-files} # can be switched to "web"
@@ -251,8 +250,6 @@ services:
     image: osixia/openldap:latest
     networks:
       ocis-net:
-    ports:
-      - 636:636
     command: --copy-service --loglevel debug
     environment:
       LDAP_TLS_VERIFY_CLIENT: never

deployments/examples/oc10_ocis_parallel/testing/docker-compose-additions.yml

@@ -0,0 +1,17 @@
+---
+version: "3.7"
+
+services:
+  ocis:
+    environment:
+      PROXY_ENABLE_BASIC_AUTH: true
+
+  oc10:
+    ports:
+      - 8080:8080
+    volumes:
+      - ./config/oc10/11-testing-app.sh:/etc/pre_server.d/11-testing-app.sh
+
+  openldap:
+    ports:
+      - 636:636