From faf1223548df5ab562264bc48583ed91b5329e7e Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@pondersource.com>
Date: Sat, 9 Dec 2023 11:44:01 +0100
Subject: [PATCH 1/7] cp -f compatible with Mac

---
 ci/ocm-test-suite.sh                | 4 ++--
 release/federatedgroups-owncloud.sh | 2 +-
 release/ocm-owncloud.sh             | 2 +-
 release/sciencemesh-nextcloud.sh    | 2 +-
 release/sciencemesh-owncloud.sh     | 2 +-
 tests/base-nextcloud.sh             | 2 +-
 tests/base-owncloud.sh              | 2 +-
 tests/ocm-test-suite.sh             | 4 ++--
 tests/rd-sram.sh                    | 2 +-
 tests/sciencemesh.sh                | 4 ++--
 tests/sm-sram-ocm.sh                | 2 +-
 tests/surf-trashbin.sh              | 2 +-
 tests/testing-ocm-nc-oc.sh          | 4 ++--
 tests/testing-ocm.sh                | 2 +-
 14 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/ci/ocm-test-suite.sh b/ci/ocm-test-suite.sh
index f8145b82..2ac8895c 100755
--- a/ci/ocm-test-suite.sh
+++ b/ci/ocm-test-suite.sh
@@ -45,8 +45,8 @@ function waitForPort () {
 [ ! -d "${ENV_ROOT}/temp" ] && mkdir --parents "${ENV_ROOT}/temp"
 
 # copy init files.
-cp --force ./docker/scripts/init-owncloud-sciencemesh.sh  ./temp/owncloud.sh
-cp --force ./docker/scripts/init-nextcloud-sciencemesh.sh ./temp/nextcloud.sh
+cp -f ./docker/scripts/init-owncloud-sciencemesh.sh  ./temp/owncloud.sh
+cp -f ./docker/scripts/init-nextcloud-sciencemesh.sh ./temp/nextcloud.sh
 
 docker run --detach --network=testnet                                         \
   --name=meshdir.docker                                                       \
diff --git a/release/federatedgroups-owncloud.sh b/release/federatedgroups-owncloud.sh
index 505d3333..a6664e02 100755
--- a/release/federatedgroups-owncloud.sh
+++ b/release/federatedgroups-owncloud.sh
@@ -14,7 +14,7 @@ BRANCH_OWNCLOUD_APP=release
 [ ! -d "${REPO_ROOT}/temp" ] && mkdir -p "${REPO_ROOT}/temp"
 
 # copy init files.
-cp --force "${REPO_ROOT}/docker/scripts/init-owncloud-rd-sram.sh"  "${REPO_ROOT}/temp/oc-rd-sram.sh"
+cp -f "${REPO_ROOT}/docker/scripts/init-owncloud-rd-sram.sh"  "${REPO_ROOT}/temp/oc-rd-sram.sh"
 
 # ownCloud federatedgroups source code.
 [ ! -d "rd-sram-release" ] &&                                                   \
diff --git a/release/ocm-owncloud.sh b/release/ocm-owncloud.sh
index c18e0df3..66ec4501 100755
--- a/release/ocm-owncloud.sh
+++ b/release/ocm-owncloud.sh
@@ -14,7 +14,7 @@ BRANCH_OWNCLOUD_APP=release
 [ ! -d "${REPO_ROOT}/temp" ] && mkdir -p "${REPO_ROOT}/temp"
 
 # copy init files.
-cp --force "${REPO_ROOT}/docker/scripts/init-owncloud-opencloudmesh.sh" "${REPO_ROOT}/temp/oc-opencloudmesh.sh"
+cp -f "${REPO_ROOT}/docker/scripts/init-owncloud-opencloudmesh.sh" "${REPO_ROOT}/temp/oc-opencloudmesh.sh"
 
 # ownCloud opencloudmesh source code.
 [ ! -d "oc-ocm-release" ] &&                                                    \
diff --git a/release/sciencemesh-nextcloud.sh b/release/sciencemesh-nextcloud.sh
index 6efe0548..8078fb10 100755
--- a/release/sciencemesh-nextcloud.sh
+++ b/release/sciencemesh-nextcloud.sh
@@ -13,7 +13,7 @@ BRANCH_OWNCLOUD_APP=nextcloud
 [ ! -d "temp" ] && mkdir -p temp
 
 # copy init file.
-cp --force ./docker/scripts/init-nextcloud-sciencemesh.sh ./temp/nc.sh
+cp -f ./docker/scripts/init-nextcloud-sciencemesh.sh ./temp/nc.sh
 
 # add additional tagging for docker images.
 docker tag pondersource/dev-stock-nextcloud-sciencemesh pondersource/dev-stock-nc1-sciencemesh
diff --git a/release/sciencemesh-owncloud.sh b/release/sciencemesh-owncloud.sh
index 603cced7..a77f5669 100755
--- a/release/sciencemesh-owncloud.sh
+++ b/release/sciencemesh-owncloud.sh
@@ -13,7 +13,7 @@ BRANCH_OWNCLOUD_APP=owncloud
 [ ! -d "temp" ] && mkdir -p temp
 
 # copy init file.
-cp --force ./docker/scripts/init-owncloud-sciencemesh.sh ./temp/oc.sh
+cp -f ./docker/scripts/init-owncloud-sciencemesh.sh ./temp/oc.sh
 
 # add additional tagging for docker images.
 docker tag pondersource/dev-stock-owncloud-sciencemesh pondersource/dev-stock-oc1-sciencemesh
diff --git a/tests/base-nextcloud.sh b/tests/base-nextcloud.sh
index ba138e85..bb8c6c52 100755
--- a/tests/base-nextcloud.sh
+++ b/tests/base-nextcloud.sh
@@ -35,7 +35,7 @@ function waitForPort () {
 [ ! -d "${ENV_ROOT}/temp" ] && mkdir -p "${ENV_ROOT}/temp"
 
 # copy init files.
-cp --force "${ENV_ROOT}/docker/scripts/init-nextcloud.sh" "${ENV_ROOT}/temp/nc-base.sh"
+cp -f "${ENV_ROOT}/docker/scripts/init-nextcloud.sh" "${ENV_ROOT}/temp/nc-base.sh"
 
 # echo "starting firefox tester"
 docker run --detach --name=firefox          --network=testnet -p 5800:5800  --shm-size 2g jlesage/firefox:latest
diff --git a/tests/base-owncloud.sh b/tests/base-owncloud.sh
index 9a8506d5..63f8c3be 100755
--- a/tests/base-owncloud.sh
+++ b/tests/base-owncloud.sh
@@ -35,7 +35,7 @@ function waitForPort () {
 [ ! -d "${ENV_ROOT}/temp" ] && mkdir -p "${ENV_ROOT}/temp"
 
 # copy init files.
-cp --force "${ENV_ROOT}/docker/scripts/init-owncloud.sh" "${ENV_ROOT}/temp/oc-base.sh"
+cp -f "${ENV_ROOT}/docker/scripts/init-owncloud.sh" "${ENV_ROOT}/temp/oc-base.sh"
 
 echo "starting firefox tester"
 docker run --detach --name=firefox          --network=testnet -p 5800:5800  --shm-size 2g jlesage/firefox:latest
diff --git a/tests/ocm-test-suite.sh b/tests/ocm-test-suite.sh
index d07be178..b0c7db2c 100755
--- a/tests/ocm-test-suite.sh
+++ b/tests/ocm-test-suite.sh
@@ -49,8 +49,8 @@ function waitForCollabora {
 [ ! -d "${ENV_ROOT}/temp" ] && mkdir --parents "${ENV_ROOT}/temp"
 
 # copy init files.
-cp --force ./docker/scripts/init-owncloud-sciencemesh.sh  ./temp/owncloud.sh
-cp --force ./docker/scripts/init-nextcloud-sciencemesh.sh ./temp/nextcloud.sh
+cp -f ./docker/scripts/init-owncloud-sciencemesh.sh  ./temp/owncloud.sh
+cp -f ./docker/scripts/init-nextcloud-sciencemesh.sh ./temp/nextcloud.sh
 sudo rm --force --recursive "${ENV_ROOT}/temp/.X11-unix"
 
 docker run --detach --name=meshdir.docker   --network=testnet -v "${ENV_ROOT}/docker/scripts/stub.js:/ocm-stub/stub.js" pondersource/dev-stock-ocmstub
diff --git a/tests/rd-sram.sh b/tests/rd-sram.sh
index aa419bbb..409b4ce5 100755
--- a/tests/rd-sram.sh
+++ b/tests/rd-sram.sh
@@ -38,7 +38,7 @@ function waitForPort () {
 [ ! -d "${ENV_ROOT}/temp" ] && mkdir -p "${ENV_ROOT}/temp"
 
 # copy init files.
-cp --force "${ENV_ROOT}/docker/scripts/init-owncloud-rd-sram.sh" "${ENV_ROOT}/temp/oc-rd-sram.sh"
+cp -f "${ENV_ROOT}/docker/scripts/init-owncloud-rd-sram.sh" "${ENV_ROOT}/temp/oc-rd-sram.sh"
 
 docker run --detach --name=firefox          --network=testnet -p 5800:5800  --shm-size 2g jlesage/firefox:latest
 docker run --detach --name=firefox-legacy   --network=testnet -p 5900:5800  --shm-size 2g jlesage/firefox:v1.18.0
diff --git a/tests/sciencemesh.sh b/tests/sciencemesh.sh
index 19cb0c8a..1bf3e02b 100755
--- a/tests/sciencemesh.sh
+++ b/tests/sciencemesh.sh
@@ -46,8 +46,8 @@ function waitForCollabora {
 [ ! -d "${ENV_ROOT}/temp" ] && mkdir --parents "${ENV_ROOT}/temp"
 
 # copy init files.
-cp --force ./docker/scripts/init-owncloud-sciencemesh.sh  ./temp/owncloud.sh
-cp --force ./docker/scripts/init-nextcloud-sciencemesh.sh ./temp/nextcloud.sh
+cp -f ./docker/scripts/init-owncloud-sciencemesh.sh  ./temp/owncloud.sh
+cp -f ./docker/scripts/init-nextcloud-sciencemesh.sh ./temp/nextcloud.sh
 
 docker run --detach --name=meshdir.docker   --network=testnet -v "${ENV_ROOT}/docker/scripts/stub.js:/ocm-stub/stub.js" pondersource/dev-stock-ocmstub
 docker run --detach --name=firefox          --network=testnet -p 5800:5800  --shm-size 2g jlesage/firefox:latest
diff --git a/tests/sm-sram-ocm.sh b/tests/sm-sram-ocm.sh
index 1c2cc66d..6b403b3a 100755
--- a/tests/sm-sram-ocm.sh
+++ b/tests/sm-sram-ocm.sh
@@ -49,7 +49,7 @@ function waitForCollabora {
 [ ! -d "${ENV_ROOT}/temp" ] && mkdir --parents "${ENV_ROOT}/temp"
 
 # copy init files.
-cp --force ./docker/scripts/init-owncloud-sm-sram-ocm.sh  ./temp/owncloud.sh
+cp -f ./docker/scripts/init-owncloud-sm-sram-ocm.sh  ./temp/owncloud.sh
 
 docker run --detach --name=meshdir.docker   --network=testnet -v "${ENV_ROOT}/docker/scripts/stub.js:/ocm-stub/stub.js" pondersource/dev-stock-ocmstub
 docker run --detach --name=firefox          --network=testnet -p 5800:5800  --shm-size 2g jlesage/firefox:latest
diff --git a/tests/surf-trashbin.sh b/tests/surf-trashbin.sh
index 6e39e165..fb71f108 100755
--- a/tests/surf-trashbin.sh
+++ b/tests/surf-trashbin.sh
@@ -35,7 +35,7 @@ function waitForPort () {
 [ ! -d "${ENV_ROOT}/temp" ] && mkdir -p "${ENV_ROOT}/temp"
 
 # copy init files.
-cp --force "${ENV_ROOT}/docker/scripts/init-owncloud-surf-trashbin.sh" "${ENV_ROOT}/temp/oc-surf-trashbin.sh"
+cp -f "${ENV_ROOT}/docker/scripts/init-owncloud-surf-trashbin.sh" "${ENV_ROOT}/temp/oc-surf-trashbin.sh"
 
 echo "starting firefox tester"
 docker run --detach --name=firefox          --network=testnet -p 5800:5800  --shm-size 2g jlesage/firefox:latest
diff --git a/tests/testing-ocm-nc-oc.sh b/tests/testing-ocm-nc-oc.sh
index 298f78f3..54a974f1 100755
--- a/tests/testing-ocm-nc-oc.sh
+++ b/tests/testing-ocm-nc-oc.sh
@@ -22,8 +22,8 @@ function waitForPort {
 [ ! -d "${REPO_ROOT}/temp" ] && mkdir -p "${REPO_ROOT}/temp"
 
 # copy init files.
-cp --force "${REPO_ROOT}/docker/scripts/init-nextcloud.sh" "${REPO_ROOT}/temp/nc-base.sh"
-cp --force "${REPO_ROOT}/docker/scripts/init-owncloud-opencloudmesh.sh"  "${REPO_ROOT}/temp/oc-opencloudmesh.sh"
+cp -f "${REPO_ROOT}/docker/scripts/init-nextcloud.sh" "${REPO_ROOT}/temp/nc-base.sh"
+cp -f "${REPO_ROOT}/docker/scripts/init-owncloud-opencloudmesh.sh"  "${REPO_ROOT}/temp/oc-opencloudmesh.sh"
 
 echo "starting firefox tester"
 docker run --detach --name=firefox        --network=testnet -p 5800:5800 --shm-size 2g jlesage/firefox:latest
diff --git a/tests/testing-ocm.sh b/tests/testing-ocm.sh
index a5c00a2a..682e3b28 100755
--- a/tests/testing-ocm.sh
+++ b/tests/testing-ocm.sh
@@ -22,7 +22,7 @@ function waitForPort {
 [ ! -d "${REPO_ROOT}/temp" ] && mkdir -p "${REPO_ROOT}/temp"
 
 # copy init files.
-cp --force "${REPO_ROOT}/docker/scripts/init-owncloud-opencloudmesh.sh" "${REPO_ROOT}/temp/oc-opencloudmesh.sh"
+cp -f "${REPO_ROOT}/docker/scripts/init-owncloud-opencloudmesh.sh" "${REPO_ROOT}/temp/oc-opencloudmesh.sh"
 
 echo "starting firefox tester"
 docker run --detach --name=firefox        --network=testnet -p 5800:5800 --shm-size 2g jlesage/firefox:latest

From e52f01eced96225aa2949a08e0d44a3891d66c9b Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@pondersource.com>
Date: Sat, 9 Dec 2023 11:45:02 +0100
Subject: [PATCH 2/7] rm -rf compatible with Mac

---
 tests/ocm-test-suite.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ocm-test-suite.sh b/tests/ocm-test-suite.sh
index b0c7db2c..6e9e8197 100755
--- a/tests/ocm-test-suite.sh
+++ b/tests/ocm-test-suite.sh
@@ -51,7 +51,7 @@ function waitForCollabora {
 # copy init files.
 cp -f ./docker/scripts/init-owncloud-sciencemesh.sh  ./temp/owncloud.sh
 cp -f ./docker/scripts/init-nextcloud-sciencemesh.sh ./temp/nextcloud.sh
-sudo rm --force --recursive "${ENV_ROOT}/temp/.X11-unix"
+sudo rm -rf "${ENV_ROOT}/temp/.X11-unix"
 
 docker run --detach --name=meshdir.docker   --network=testnet -v "${ENV_ROOT}/docker/scripts/stub.js:/ocm-stub/stub.js" pondersource/dev-stock-ocmstub
 docker run --detach --name=firefox          --network=testnet -p 5800:5800  --shm-size 2g jlesage/firefox:latest

From 0d10c3704539f24201d87e92de7d99300b09b042 Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@pondersource.com>
Date: Sat, 9 Dec 2023 11:46:18 +0100
Subject: [PATCH 3/7] Add test for
 https://github.com/pondersource/nextcloud-mfa-awareness/issues/103

---
 tests/nextcloud-fileaccess-text.sh | 108 +++++++++++++++++++++++++++++
 1 file changed, 108 insertions(+)
 create mode 100755 tests/nextcloud-fileaccess-text.sh

diff --git a/tests/nextcloud-fileaccess-text.sh b/tests/nextcloud-fileaccess-text.sh
new file mode 100755
index 00000000..bb8c6c52
--- /dev/null
+++ b/tests/nextcloud-fileaccess-text.sh
@@ -0,0 +1,108 @@
+#!/usr/bin/env bash
+
+# @michielbdejong halt on error in docker init scripts
+set -e
+
+# find this scripts location.
+SOURCE=${BASH_SOURCE[0]}
+while [ -L "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
+  DIR=$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )
+  SOURCE=$(readlink "$SOURCE")
+   # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
+  [[ $SOURCE != /* ]] && SOURCE=$DIR/$SOURCE
+done
+DIR=$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )
+
+cd "$DIR/.." || exit
+
+ENV_ROOT=$(pwd)
+export ENV_ROOT=${ENV_ROOT}
+
+function waitForPort () {
+  echo waitForPort ${1} ${2}
+  # the "| cat" after the "| grep" is to prevent the command from exiting with 1 if no match is found by grep.
+  x=$(docker exec -it "${1}" ss -tulpn | grep -c "${2}" | cat)
+  until [ "${x}" -ne 0 ]
+  do
+    echo Waiting for "${1}" to open port "${2}", this usually takes about 10 seconds ... "${x}"
+    sleep 1
+    x=$(docker exec -it "${1}" ss -tulpn | grep -c "${2}" |  cat)
+  done
+  echo "${1}" port "${2}" is open
+}
+
+# create temp dirctory if it doesn't exist.
+[ ! -d "${ENV_ROOT}/temp" ] && mkdir -p "${ENV_ROOT}/temp"
+
+# copy init files.
+cp -f "${ENV_ROOT}/docker/scripts/init-nextcloud.sh" "${ENV_ROOT}/temp/nc-base.sh"
+
+# echo "starting firefox tester"
+docker run --detach --name=firefox          --network=testnet -p 5800:5800  --shm-size 2g jlesage/firefox:latest
+docker run --detach --name=firefox-legacy   --network=testnet -p 5900:5800  --shm-size 2g jlesage/firefox:v1.18.0
+
+echo "starting maria1.docker"
+docker run --detach --network=testnet                                                               \
+  --name=maria1.docker                                                                              \
+  -e MARIADB_ROOT_PASSWORD=eilohtho9oTahsuongeeTh7reedahPo1Ohwi3aek                                 \
+  mariadb                                                                                           \
+  --transaction-isolation=READ-COMMITTED                                                            \
+  --binlog-format=ROW                                                                               \
+  --innodb-file-per-table=1                                                                         \
+  --skip-innodb-read-only-compressed
+
+echo "starting nc1.docker"
+docker run --detach --network=testnet                                                               \
+  --name=nc1.docker                                                                                 \
+  --publish 8080:80                                                                                 \
+  --add-host "host.docker.internal:host-gateway"                                                    \
+  -e HOST="nc1"                                                                                     \
+  -e DBHOST="maria1.docker"                                                                         \
+  -e USER="einstein"                                                                                \
+  -e PASS="relativity"                                                                              \
+  -v "${ENV_ROOT}/temp/nc-base.sh:/init.sh"                                                        \
+  pondersource/dev-stock-nextcloud
+
+echo "starting maria2.docker"
+docker run --detach --network=testnet                                                               \
+  --name=maria2.docker                                                                              \
+  -e MARIADB_ROOT_PASSWORD=eilohtho9oTahsuongeeTh7reedahPo1Ohwi3aek                                 \
+  mariadb                                                                                           \
+  --transaction-isolation=READ-COMMITTED                                                            \
+  --binlog-format=ROW                                                                               \
+  --innodb-file-per-table=1                                                                         \
+  --skip-innodb-read-only-compressed
+
+echo "starting nc2.docker"
+docker run --detach --network=testnet                                                               \
+  --name=nc2.docker                                                                                 \
+  --publish 9080:80                                                                                 \
+  --add-host "host.docker.internal:host-gateway"                                                    \
+  -e HOST="nc2"                                                                                     \
+  -e DBHOST="maria2.docker"                                                                         \
+  -e USER="marie"                                                                                   \
+  -e PASS="radioactivity"                                                                           \
+  -v "${ENV_ROOT}/temp/nc-base.sh:/init.sh"                                                        \
+  pondersource/dev-stock-nextcloud
+
+waitForPort maria1.docker 3306
+waitForPort nc1.docker 443
+
+docker exec "nc1.docker" bash -c "cp /tls/*.crt /usr/local/share/ca-certificates/"
+docker exec "nc1.docker" bash -c "cp /tls-host/*.crt /usr/local/share/ca-certificates/"
+docker exec "nc1.docker" update-ca-certificates
+docker exec "nc1.docker" bash -c "cat /etc/ssl/certs/ca-certificates.crt >> /var/www/html/resources/config/ca-bundle.crt"
+
+echo "executing init.sh on nc1.docker"
+docker exec -u www-data nc1.docker bash /init.sh
+
+waitForPort maria2.docker 3306
+waitForPort nc2.docker 443
+
+docker exec "nc2.docker" bash -c "cp /tls/*.crt /usr/local/share/ca-certificates/"
+docker exec "nc2.docker" bash -c "cp /tls-host/*.crt /usr/local/share/ca-certificates/"
+docker exec "nc2.docker" update-ca-certificates
+docker exec "nc2.docker" bash -c "cat /etc/ssl/certs/ca-certificates.crt >> /var/www/html/resources/config/ca-bundle.crt"
+
+echo "executing init.sh on nc2.docker"
+docker exec -u www-data nc2.docker bash /init.sh

From b20604cde77141455390ff4a537bae523ac35d19 Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@pondersource.com>
Date: Sat, 9 Dec 2023 12:29:58 +0100
Subject: [PATCH 4/7] Mount docker/tls as /tls-host

---
 tests/base-nextcloud.sh            | 6 ++++--
 tests/base-owncloud.sh             | 8 ++++++--
 tests/nextcloud-fileaccess-text.sh | 7 +++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/tests/base-nextcloud.sh b/tests/base-nextcloud.sh
index bb8c6c52..327b8ded 100755
--- a/tests/base-nextcloud.sh
+++ b/tests/base-nextcloud.sh
@@ -60,7 +60,8 @@ docker run --detach --network=testnet
   -e DBHOST="maria1.docker"                                                                         \
   -e USER="einstein"                                                                                \
   -e PASS="relativity"                                                                              \
-  -v "${ENV_ROOT}/temp/nc-base.sh:/init.sh"                                                        \
+  -v "${ENV_ROOT}/temp/nc-base.sh:/init.sh"                                                         \
+  -v "${ENV_ROOT}/docker/tls:/tls-host"                                                             \
   pondersource/dev-stock-nextcloud
 
 echo "starting maria2.docker"
@@ -82,7 +83,8 @@ docker run --detach --network=testnet
   -e DBHOST="maria2.docker"                                                                         \
   -e USER="marie"                                                                                   \
   -e PASS="radioactivity"                                                                           \
-  -v "${ENV_ROOT}/temp/nc-base.sh:/init.sh"                                                        \
+  -v "${ENV_ROOT}/temp/nc-base.sh:/init.sh"                                                         \
+  -v "${ENV_ROOT}/docker/tls:/tls-host"                                                             \
   pondersource/dev-stock-nextcloud
 
 waitForPort maria1.docker 3306
diff --git a/tests/base-owncloud.sh b/tests/base-owncloud.sh
index 63f8c3be..5a429ebe 100755
--- a/tests/base-owncloud.sh
+++ b/tests/base-owncloud.sh
@@ -60,7 +60,9 @@ docker run --detach --network=testnet
   -e DBHOST="maria1.docker"                                                                         \
   -e USER="einstein"                                                                                \
   -e PASS="relativity"                                                                              \
-  -v "${ENV_ROOT}/temp/oc-base.sh:/init.sh"                                                        \
+  -v "${ENV_ROOT}/temp/oc-base.sh:/init.sh"                                                         \
+  -v "${ENV_ROOT}/docker/tls:/tls-host"                                                             \
+
   pondersource/dev-stock-owncloud
 
 echo "starting maria2.docker"
@@ -82,7 +84,9 @@ docker run --detach --network=testnet
   -e DBHOST="maria2.docker"                                                                         \
   -e USER="marie"                                                                                   \
   -e PASS="radioactivity"                                                                           \
-  -v "${ENV_ROOT}/temp/oc-base.sh:/init.sh"                                                     \
+  -v "${ENV_ROOT}/temp/oc-base.sh:/init.sh"                                                         \
+  -v "${ENV_ROOT}/docker/tls:/tls-host"                                                             \
+
   pondersource/dev-stock-owncloud
 
 waitForPort maria1.docker 3306
diff --git a/tests/nextcloud-fileaccess-text.sh b/tests/nextcloud-fileaccess-text.sh
index bb8c6c52..d411c1f4 100755
--- a/tests/nextcloud-fileaccess-text.sh
+++ b/tests/nextcloud-fileaccess-text.sh
@@ -60,7 +60,9 @@ docker run --detach --network=testnet
   -e DBHOST="maria1.docker"                                                                         \
   -e USER="einstein"                                                                                \
   -e PASS="relativity"                                                                              \
-  -v "${ENV_ROOT}/temp/nc-base.sh:/init.sh"                                                        \
+  -v "${ENV_ROOT}/temp/nc-base.sh:/init.sh"                                                         \
+  -v "${ENV_ROOT}/docker/tls:/tls-host"                                                             \
+
   pondersource/dev-stock-nextcloud
 
 echo "starting maria2.docker"
@@ -82,7 +84,8 @@ docker run --detach --network=testnet
   -e DBHOST="maria2.docker"                                                                         \
   -e USER="marie"                                                                                   \
   -e PASS="radioactivity"                                                                           \
-  -v "${ENV_ROOT}/temp/nc-base.sh:/init.sh"                                                        \
+  -v "${ENV_ROOT}/temp/nc-base.sh:/init.sh"                                                         \
+  -v "${ENV_ROOT}/docker/tls:/tls-host"                                                             \
   pondersource/dev-stock-nextcloud
 
 waitForPort maria1.docker 3306

From d00630b91aaddab1b074ce4215d14b4e6566dfbd Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@pondersource.com>
Date: Mon, 11 Dec 2023 16:48:35 +0100
Subject: [PATCH 5/7] Mount docker/tls as /tls-host

---
 tests/nextcloud-fileaccess-text.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/nextcloud-fileaccess-text.sh b/tests/nextcloud-fileaccess-text.sh
index d411c1f4..327b8ded 100755
--- a/tests/nextcloud-fileaccess-text.sh
+++ b/tests/nextcloud-fileaccess-text.sh
@@ -62,7 +62,6 @@ docker run --detach --network=testnet
   -e PASS="relativity"                                                                              \
   -v "${ENV_ROOT}/temp/nc-base.sh:/init.sh"                                                         \
   -v "${ENV_ROOT}/docker/tls:/tls-host"                                                             \
-
   pondersource/dev-stock-nextcloud
 
 echo "starting maria2.docker"

From 3b8d768a06c384ceb2393214a62eebafb1d6b95a Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@pondersource.com>
Date: Mon, 11 Dec 2023 15:50:58 +0100
Subject: [PATCH 6/7] Separate docker image
 pondersource/nextcloud-fileacess-text

---
 docker/build/fileaccess-text.sh               | 36 +++++++++++++++++++
 .../nextcloud-fileaccess-text.Dockerfile      |  5 +++
 .../scripts/init-nextcloud-fileaccess-text.sh | 15 ++++++++
 tests/nextcloud-fileaccess-text.sh            |  4 +--
 4 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100755 docker/build/fileaccess-text.sh
 create mode 100644 docker/dockerfiles/nextcloud-fileaccess-text.Dockerfile
 create mode 100755 docker/scripts/init-nextcloud-fileaccess-text.sh

diff --git a/docker/build/fileaccess-text.sh b/docker/build/fileaccess-text.sh
new file mode 100755
index 00000000..c2ff9491
--- /dev/null
+++ b/docker/build/fileaccess-text.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+# CACHEBUST forces docker to clone fresh source codes from git.
+# example: docker build -t your-image --build-arg CACHEBUST="default" .
+
+set -e
+
+# @michielbdejong avoid docker buildkit
+export DOCKER_BUILDKIT=0
+
+# find this scripts location.
+SOURCE=${BASH_SOURCE[0]}
+while [ -L "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
+  DIR=$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )
+  SOURCE=$(readlink "$SOURCE")
+   # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
+  [[ $SOURCE != /* ]] && SOURCE=$DIR/$SOURCE
+done
+DIR=$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )
+
+cd "$DIR/.."
+
+echo Building pondersource/dev-stock-php-base
+docker build --build-arg CACHEBUST="default" --file ./dockerfiles/php-base.Dockerfile --tag pondersource/dev-stock-php-base .
+
+echo Building pondersource/dev-stock-nextcloud
+docker build --build-arg CACHEBUST="default" --file ./dockerfiles/nextcloud.Dockerfile --tag pondersource/dev-stock-nextcloud .
+
+echo Building pondersource/dev-stock-nextcloud-fileaccess-text
+docker build --build-arg CACHEBUST="default" --file ./dockerfiles/nextcloud-fileaccess-text.Dockerfile --tag pondersource/dev-stock-nextcloud-fileaccess-text .
+
+echo Building pondersource/dev-stock-owncloud
+docker build --build-arg CACHEBUST="default" --file ./dockerfiles/owncloud.Dockerfile --tag pondersource/dev-stock-owncloud .
+
+echo Building pondersource/dev-stock-nextcloud-fileaccess-text
+docker build --build-arg CACHEBUST="default" --file ./dockerfiles/nextcloud-fileaccess-text.Dockerfile --tag pondersource/dev-stock-nextcloud-fileaccess-text .
diff --git a/docker/dockerfiles/nextcloud-fileaccess-text.Dockerfile b/docker/dockerfiles/nextcloud-fileaccess-text.Dockerfile
new file mode 100644
index 00000000..231ca50b
--- /dev/null
+++ b/docker/dockerfiles/nextcloud-fileaccess-text.Dockerfile
@@ -0,0 +1,5 @@
+FROM pondersource/dev-stock-nextcloud
+
+ARG files_accesscontrol_version=1.16.2
+RUN wget -q https://github.com/nextcloud-releases/files_accesscontrol/releases/download/v${files_accesscontrol_version}/files_accesscontrol-v${files_accesscontrol_version}.tar.gz -O /tmp/files_accesscontrol.tar.gz \
+  && cd /tmp && tar xf /tmp/files_accesscontrol.tar.gz && mv /tmp/files_accesscontrol /var/www/html/custom_apps/
diff --git a/docker/scripts/init-nextcloud-fileaccess-text.sh b/docker/scripts/init-nextcloud-fileaccess-text.sh
new file mode 100755
index 00000000..dfe941c9
--- /dev/null
+++ b/docker/scripts/init-nextcloud-fileaccess-text.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+# @michielbdejong halt on error in docker init scripts
+set -e
+
+php console.php maintenance:install --admin-user "$USER" --admin-pass "$PASS" --database "mysql"                \
+                                    --database-name "efss" --database-user "root" --database-host "$DBHOST"     \
+                                    --database-pass "eilohtho9oTahsuongeeTh7reedahPo1Ohwi3aek"
+php console.php app:disable firstrunwizard
+php console.php app:enable files_accesscontrol
+# php console.php app:enable text
+
+sed -i "8 i\      1 => 'nc1.docker'," /var/www/html/config/config.php
+sed -i "9 i\      2 => 'nc2.docker'," /var/www/html/config/config.php
+sed -i "3 i\  'allow_local_remote_servers' => true," config/config.php
diff --git a/tests/nextcloud-fileaccess-text.sh b/tests/nextcloud-fileaccess-text.sh
index 327b8ded..cfe13cdc 100755
--- a/tests/nextcloud-fileaccess-text.sh
+++ b/tests/nextcloud-fileaccess-text.sh
@@ -62,7 +62,7 @@ docker run --detach --network=testnet
   -e PASS="relativity"                                                                              \
   -v "${ENV_ROOT}/temp/nc-base.sh:/init.sh"                                                         \
   -v "${ENV_ROOT}/docker/tls:/tls-host"                                                             \
-  pondersource/dev-stock-nextcloud
+  pondersource/dev-stock-nextcloud-fileaccess-text
 
 echo "starting maria2.docker"
 docker run --detach --network=testnet                                                               \
@@ -85,7 +85,7 @@ docker run --detach --network=testnet
   -e PASS="radioactivity"                                                                           \
   -v "${ENV_ROOT}/temp/nc-base.sh:/init.sh"                                                         \
   -v "${ENV_ROOT}/docker/tls:/tls-host"                                                             \
-  pondersource/dev-stock-nextcloud
+  pondersource/dev-stock-nextcloud-fileaccess-text
 
 waitForPort maria1.docker 3306
 waitForPort nc1.docker 443

From 703d17fb460fe19bba18a4618d5d167d718b0e60 Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@pondersource.com>
Date: Mon, 11 Dec 2023 16:46:36 +0100
Subject: [PATCH 7/7] Use SUNET image for fileaccess-text testing

---
 docker/build/fileaccess-text.sh                   | 15 ++++++---------
 .../nextcloud-fileaccess-text.Dockerfile          |  8 ++++----
 tests/nextcloud-fileaccess-text.sh                |  4 ++--
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/docker/build/fileaccess-text.sh b/docker/build/fileaccess-text.sh
index c2ff9491..29dd568f 100755
--- a/docker/build/fileaccess-text.sh
+++ b/docker/build/fileaccess-text.sh
@@ -20,17 +20,14 @@ DIR=$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )
 
 cd "$DIR/.."
 
-echo Building pondersource/dev-stock-php-base
-docker build --build-arg CACHEBUST="default" --file ./dockerfiles/php-base.Dockerfile --tag pondersource/dev-stock-php-base .
+# echo Building pondersource/dev-stock-php-base
+# docker build --build-arg CACHEBUST="default" --file ./dockerfiles/php-base.Dockerfile --tag pondersource/dev-stock-php-base .
 
-echo Building pondersource/dev-stock-nextcloud
-docker build --build-arg CACHEBUST="default" --file ./dockerfiles/nextcloud.Dockerfile --tag pondersource/dev-stock-nextcloud .
+# echo Building pondersource/dev-stock-nextcloud
+# docker build --build-arg CACHEBUST="default" --file ./dockerfiles/nextcloud.Dockerfile --tag pondersource/dev-stock-nextcloud .
 
-echo Building pondersource/dev-stock-nextcloud-fileaccess-text
-docker build --build-arg CACHEBUST="default" --file ./dockerfiles/nextcloud-fileaccess-text.Dockerfile --tag pondersource/dev-stock-nextcloud-fileaccess-text .
-
-echo Building pondersource/dev-stock-owncloud
-docker build --build-arg CACHEBUST="default" --file ./dockerfiles/owncloud.Dockerfile --tag pondersource/dev-stock-owncloud .
+echo Building pondersource/dev-stock-nextcloud-sunet
+docker build --build-arg CACHEBUST="default" --file ./dockerfiles/nextcloud-sunet.Dockerfile --tag pondersource/dev-stock-nextcloud-sunet .
 
 echo Building pondersource/dev-stock-nextcloud-fileaccess-text
 docker build --build-arg CACHEBUST="default" --file ./dockerfiles/nextcloud-fileaccess-text.Dockerfile --tag pondersource/dev-stock-nextcloud-fileaccess-text .
diff --git a/docker/dockerfiles/nextcloud-fileaccess-text.Dockerfile b/docker/dockerfiles/nextcloud-fileaccess-text.Dockerfile
index 231ca50b..d532a1f1 100644
--- a/docker/dockerfiles/nextcloud-fileaccess-text.Dockerfile
+++ b/docker/dockerfiles/nextcloud-fileaccess-text.Dockerfile
@@ -1,5 +1,5 @@
-FROM pondersource/dev-stock-nextcloud
+FROM pondersource/dev-stock-nextcloud-sunet
 
-ARG files_accesscontrol_version=1.16.2
-RUN wget -q https://github.com/nextcloud-releases/files_accesscontrol/releases/download/v${files_accesscontrol_version}/files_accesscontrol-v${files_accesscontrol_version}.tar.gz -O /tmp/files_accesscontrol.tar.gz \
-  && cd /tmp && tar xf /tmp/files_accesscontrol.tar.gz && mv /tmp/files_accesscontrol /var/www/html/custom_apps/
+# ARG files_accesscontrol_version=1.16.2
+# RUN wget -q https://github.com/nextcloud-releases/files_accesscontrol/releases/download/v${files_accesscontrol_version}/files_accesscontrol-v${files_accesscontrol_version}.tar.gz -O /tmp/files_accesscontrol.tar.gz \
+#   && cd /tmp && tar xf /tmp/files_accesscontrol.tar.gz && mv /tmp/files_accesscontrol /var/www/html/custom_apps/
diff --git a/tests/nextcloud-fileaccess-text.sh b/tests/nextcloud-fileaccess-text.sh
index cfe13cdc..c2c10d74 100755
--- a/tests/nextcloud-fileaccess-text.sh
+++ b/tests/nextcloud-fileaccess-text.sh
@@ -38,8 +38,8 @@ function waitForPort () {
 cp -f "${ENV_ROOT}/docker/scripts/init-nextcloud.sh" "${ENV_ROOT}/temp/nc-base.sh"
 
 # echo "starting firefox tester"
-docker run --detach --name=firefox          --network=testnet -p 5800:5800  --shm-size 2g jlesage/firefox:latest
-docker run --detach --name=firefox-legacy   --network=testnet -p 5900:5800  --shm-size 2g jlesage/firefox:v1.18.0
+# docker run --detach --name=firefox          --network=testnet -p 5800:5800  --shm-size 2g jlesage/firefox:latest
+# docker run --detach --name=firefox-legacy   --network=testnet -p 5900:5800  --shm-size 2g jlesage/firefox:v1.18.0
 
 echo "starting maria1.docker"
 docker run --detach --network=testnet                                                               \