Bladeren bron

enable new design in docker (no alpine yet)

sstidl 1 jaar geleden
bovenliggende
commit
853cb4f734
2 gewijzigde bestanden met toevoegingen van 7 en 3 verwijderingen
  1. 1 0
      Dockerfile
  2. 6 3
      docker/entrypoint.sh

+ 1 - 0
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/

+ 6 - 3
docker/entrypoint.sh

@@ -36,9 +36,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