Use SUNET image for fileaccess-text testing

pondersource · Dec 11, 2023 · 703d17f · 703d17f
1 parent 3b8d768
commit 703d17f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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                                                               \