Merge pull request #693 from librespeed/fix-docker-images

Fix docker images and dual mode

Author: sstidl

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 \

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: