Skip to content

Commit

Permalink
Merge branch 'fix-docker-images' into newdesign
Browse files Browse the repository at this point in the history
  • Loading branch information
sstidl committed Dec 29, 2024
2 parents 13f6c49 + e6fac55 commit f06187a
Show file tree
Hide file tree
Showing 6 changed files with 464 additions and 4 deletions.
1 change: 1 addition & 0 deletions Dockerfile.alpine
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ RUN apk add --quiet --no-cache \
apache2 \
php-apache2 \
php-ctype \
php-phar \
php-gd \
php-openssl \
php-pdo \
Expand Down
4 changes: 4 additions & 0 deletions docker/test/README.md
Original file line number Diff line number Diff line change
@@ -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.
27 changes: 27 additions & 0 deletions docker/test/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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 ################################
Expand Down Expand Up @@ -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:
Expand Down
Loading

0 comments on commit f06187a

Please sign in to comment.