diff --git a/Build/Scripts/runTests.sh b/Build/Scripts/runTests.sh index a29ae0addc7e1bbcaaef622dd1af076cef615e79..e51dc7e2c41cbcc9b524cc057274ec9bb39d47a3 100755 --- a/Build/Scripts/runTests.sh +++ b/Build/Scripts/runTests.sh @@ -36,6 +36,7 @@ setUpDockerComposeDotEnv() { echo "PHP_VERSION=${PHP_VERSION}" echo "CHUNKS=${CHUNKS}" echo "THISCHUNK=${THISCHUNK}" + echo "DOCKER_SELENIUM_IMAGE=${DOCKER_SELENIUM_IMAGE}" } > .env } @@ -335,6 +336,16 @@ MYSQL_VERSION="5.5" POSTGRES_VERSION="10" CHUNKS=0 THISCHUNK=0 +DOCKER_SELENIUM_IMAGE="selenium/standalone-chrome:3.12" + +# Detect arm64 and use a seleniarm image. +# In a perfect world selenium would have a arm64 integrated, but that is not on the horizon. +# So for the time being we have to use seleniarm image. +ARCH=$(uname -m) +if [ $ARCH = "arm64" ]; then + DOCKER_SELENIUM_IMAGE="seleniarm/standalone-chromium:4.1.2-20220227" + echo "Architecture" $ARCH "requires" $DOCKER_SELENIUM_IMAGE "to run acceptance tests." +fi # Option parsing # Reset in case getopts has been used previously in the shell diff --git a/Build/testing-docker/local/docker-compose.yml b/Build/testing-docker/local/docker-compose.yml index dfa9f3e06ff6d5ed07e37d72aee353adc4c94e16..1026a5ea9188f4c495f18a63a6574815456e1cfc 100644 --- a/Build/testing-docker/local/docker-compose.yml +++ b/Build/testing-docker/local/docker-compose.yml @@ -1,7 +1,7 @@ version: '2.3' services: chrome: - image: selenium/standalone-chrome:3.12 + image: ${DOCKER_SELENIUM_IMAGE} mysql: image: mysql:${MYSQL_VERSION}