kevinveenbirkenbach/matomo-bootstrap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add tables-step timeout env knobs to compose, docs, and e2e

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach
2026-02-14 04:52:26 +01:00
parent fb42167b89
commit aac01810a1
5 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -216,6 +216,8 @@ services:
MATOMO_INSTALLER_READY_TIMEOUT_S: "180" MATOMO_INSTALLER_READY_TIMEOUT_S: "180"
MATOMO_INSTALLER_STEP_TIMEOUT_S: "30" MATOMO_INSTALLER_STEP_TIMEOUT_S: "30"
MATOMO_INSTALLER_STEP_DEADLINE_S: "180" MATOMO_INSTALLER_STEP_DEADLINE_S: "180"
MATOMO_INSTALLER_TABLES_CREATION_TIMEOUT_S: "180"
MATOMO_INSTALLER_TABLES_ERASE_TIMEOUT_S: "120"
MATOMO_INSTALLER_DEBUG_DIR: "/tmp/matomo-bootstrap" MATOMO_INSTALLER_DEBUG_DIR: "/tmp/matomo-bootstrap"
restart: "no" restart: "no"

2
docker-compose.yml
View File

@@ -68,6 +68,8 @@ services:
MATOMO_INSTALLER_READY_TIMEOUT_S: "180" MATOMO_INSTALLER_READY_TIMEOUT_S: "180"
MATOMO_INSTALLER_STEP_TIMEOUT_S: "30" MATOMO_INSTALLER_STEP_TIMEOUT_S: "30"
MATOMO_INSTALLER_STEP_DEADLINE_S: "180" MATOMO_INSTALLER_STEP_DEADLINE_S: "180"
MATOMO_INSTALLER_TABLES_CREATION_TIMEOUT_S: "180"
MATOMO_INSTALLER_TABLES_ERASE_TIMEOUT_S: "120"
MATOMO_INSTALLER_DEBUG_DIR: "/tmp/matomo-bootstrap" MATOMO_INSTALLER_DEBUG_DIR: "/tmp/matomo-bootstrap"
# bootstrap is a one-shot command that prints the token and exits # bootstrap is a one-shot command that prints the token and exits
# if you want to re-run, do: docker compose run --rm bootstrap # if you want to re-run, do: docker compose run --rm bootstrap

2
env.sample
View File

@@ -32,4 +32,6 @@ MATOMO_TIMEZONE=Germany - Berlin
# MATOMO_INSTALLER_READY_TIMEOUT_S=180 # MATOMO_INSTALLER_READY_TIMEOUT_S=180
# MATOMO_INSTALLER_STEP_TIMEOUT_S=30 # MATOMO_INSTALLER_STEP_TIMEOUT_S=30
# MATOMO_INSTALLER_STEP_DEADLINE_S=180 # MATOMO_INSTALLER_STEP_DEADLINE_S=180
# MATOMO_INSTALLER_TABLES_CREATION_TIMEOUT_S=180
# MATOMO_INSTALLER_TABLES_ERASE_TIMEOUT_S=120
# MATOMO_INSTALLER_DEBUG_DIR=/tmp/matomo-bootstrap # MATOMO_INSTALLER_DEBUG_DIR=/tmp/matomo-bootstrap

2
tests/e2e/test_bootstrap_nix.py
View File

@@ -24,6 +24,8 @@ export TERM='xterm'
export MATOMO_INSTALLER_READY_TIMEOUT_S="${{MATOMO_INSTALLER_READY_TIMEOUT_S:-240}}" export MATOMO_INSTALLER_READY_TIMEOUT_S="${{MATOMO_INSTALLER_READY_TIMEOUT_S:-240}}"
export MATOMO_INSTALLER_STEP_TIMEOUT_S="${{MATOMO_INSTALLER_STEP_TIMEOUT_S:-45}}" export MATOMO_INSTALLER_STEP_TIMEOUT_S="${{MATOMO_INSTALLER_STEP_TIMEOUT_S:-45}}"
export MATOMO_INSTALLER_STEP_DEADLINE_S="${{MATOMO_INSTALLER_STEP_DEADLINE_S:-240}}" export MATOMO_INSTALLER_STEP_DEADLINE_S="${{MATOMO_INSTALLER_STEP_DEADLINE_S:-240}}"
export MATOMO_INSTALLER_TABLES_CREATION_TIMEOUT_S="${{MATOMO_INSTALLER_TABLES_CREATION_TIMEOUT_S:-240}}"
export MATOMO_INSTALLER_TABLES_ERASE_TIMEOUT_S="${{MATOMO_INSTALLER_TABLES_ERASE_TIMEOUT_S:-180}}"
export MATOMO_INSTALLER_DEBUG_DIR="${{MATOMO_INSTALLER_DEBUG_DIR:-/tmp/matomo-bootstrap}}" export MATOMO_INSTALLER_DEBUG_DIR="${{MATOMO_INSTALLER_DEBUG_DIR:-/tmp/matomo-bootstrap}}"
# Make sure we have a writable HOME (compose already sets HOME=/tmp/home) # Make sure we have a writable HOME (compose already sets HOME=/tmp/home)

2
tests/e2e/test_docker_compose_stack.py
View File

@@ -173,6 +173,8 @@ class TestRootDockerComposeDefinition(unittest.TestCase):
self.assertIn("MATOMO_INSTALLER_READY_TIMEOUT_S:", bootstrap_block) self.assertIn("MATOMO_INSTALLER_READY_TIMEOUT_S:", bootstrap_block)
self.assertIn("MATOMO_INSTALLER_STEP_TIMEOUT_S:", bootstrap_block) self.assertIn("MATOMO_INSTALLER_STEP_TIMEOUT_S:", bootstrap_block)
self.assertIn("MATOMO_INSTALLER_STEP_DEADLINE_S:", bootstrap_block) self.assertIn("MATOMO_INSTALLER_STEP_DEADLINE_S:", bootstrap_block)
self.assertIn("MATOMO_INSTALLER_TABLES_CREATION_TIMEOUT_S:", bootstrap_block)
self.assertIn("MATOMO_INSTALLER_TABLES_ERASE_TIMEOUT_S:", bootstrap_block)
matomo_block = _extract_service_block(cfg.stdout, "matomo") matomo_block = _extract_service_block(cfg.stdout, "matomo")
self.assertIn("healthcheck:", matomo_block) self.assertIn("healthcheck:", matomo_block)