Implement the new design from #649

Dockerfile

@@ -16,6 +16,7 @@ RUN mkdir -p /speedtest/
 
 # Copy sources
 COPY backend/ /speedtest/backend
+COPY frontend/ /speedtest/frontend
 
 COPY results/*.php /speedtest/results/
 COPY results/*.ttf /speedtest/results/

Dockerfile.alpine

@@ -4,6 +4,7 @@ RUN apk add --quiet --no-cache \
     apache2 \
     php-apache2 \
     php-ctype \
+    php-phar \
     php-gd \
     php-openssl \
     php-pdo \
@@ -18,7 +19,6 @@ RUN apk add --quiet --no-cache \
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
 
-
 # Install extensions
 RUN install-php-extensions iconv gd pdo pdo_mysql pdo_pgsql pgsql
 
@@ -30,6 +30,7 @@ RUN mkdir -p /speedtest/
 
 # Copy sources
 COPY backend/ /speedtest/backend
+COPY frontend/ /speedtest/frontend
 
 COPY results/*.php /speedtest/results/
 COPY results/*.ttf /speedtest/results/

docker/entrypoint.sh

@@ -40,9 +40,12 @@ if [ "$MODE" == "backend" ]; then
   fi
 fi
 
-# Set up unified index.php
-if [ "$MODE" != "backend" ]; then
-  cp /speedtest/ui.php /var/www/html/index.php
+# Set up index.php for frontend-only or standalone modes
+if [[ "$MODE" == "frontend" || "$MODE" == "dual" ]]; then
+  cp -av /speedtest/frontend/* /var/www/html/
+elif [ "$MODE" == "standalone" ]; then
+  cp -av /speedtest/frontend/* /var/www/html/
+  echo '[{"name":"local","server":"/backend",  "dlURL": "garbage.php", "ulURL": "empty.php", "pingURL": "empty.php", "getIpURL": "getIP.php", "sponsorName": "", "sponsorURL": "", "id":1 }]' > /var/www/html/server-list.json
 fi
 
 # Apply Telemetry settings when running in standalone or frontend mode and telemetry is enabled

docker/test/README.md

@@ -0,0 +1,4 @@
+The files in this folder represent a simple end to end test.
+At the moment it is interactive, so you need to run `docker compose up` in the folder and watch the output for errors.
+Sometimes the mysql container needs more than 15 seconds, so the test_script fails.
+Just try it again.

docker/test/docker-compose.yml

@@ -1,5 +1,14 @@
 ## this is a docker compose file used to test all scenarios
 ## do not use it in production
+x-shared:
+  speedtest-service: &speedtest-service
+    environment:
+      - PASSWORD=gimmeTheStats1337
+      - [email protected]
+      - ENABLE_ID_OBFUSCATION=true
+      - MODE=standalone
+      - REDACT_IP_ADDRESSES=true
+      - TELEMETRY=true
 
 services:
 ###################### POSTGRESQL ################################
@@ -104,9 +113,27 @@ services:
     ports:
       - 9128:8080
 
+  speedtest-alpine-sqlite-dual:
+    <<: *speedtest-service
+    build:
+      context: ../..
+      dockerfile: Dockerfile.alpine
+    environment:
+      - MODE=dual
+
+    volumes:
+      - ./servers.json:/servers.json:ro
+    ports:
+      - 9129:8080
+
 ##############  TEST CONTAINER  ###############################################################
   test-container:
     image: alpine
+    depends_on:
+      - pg
+      - mysql
+      - speedtest-alpine-mysql
+      - speedtest-alpine-pg
     volumes:
       - ./test-script.sh:/test-script.sh
     command: