diff --git a/energy-tests/compose-fpm-mariadb.yml b/energy-tests/compose-fpm-mariadb.yml index 46abafc1..bda6fa6d 100644 --- a/energy-tests/compose-fpm-mariadb.yml +++ b/energy-tests/compose-fpm-mariadb.yml @@ -41,7 +41,8 @@ services: - ./nginx.conf:/etc/nginx/nginx.conf:ro depends_on: - app - healthcheck: - test: ["curl", "-f", "http://nc"] - interval: "1s" - +# healthcheck: +# test: curl -f http://nc +# interval: "1h" # effectively turns repeated healthchecks during runtime off +# start-period: "1s" # Not yet supported. Will come with Docker CE 25.0 +# start-interval: "1s" # Not yet supported. Will come with Docker CE 25.0 diff --git a/energy-tests/compose-mariadb.yml b/energy-tests/compose-mariadb.yml index eed4c429..ddbd3ba7 100644 --- a/energy-tests/compose-mariadb.yml +++ b/energy-tests/compose-mariadb.yml @@ -31,6 +31,8 @@ services: - MYSQL_DATABASE=nextcloud - MYSQL_USER=nextcloud - MYSQL_HOST=db - healthcheck: - test: ["curl", "-f", "http://nc"] - interval: "1s" +# healthcheck: +# test: curl -f http://nc +# interval: "1h" # effectively turns repeated healthchecks during runtime off +# start-period: "1s" # Not yet supported. Will come with Docker CE 25.0 +# start-interval: "1s" # Not yet supported. Will come with Docker CE 25.0 diff --git a/energy-tests/compose-postgres.yml b/energy-tests/compose-postgres.yml index 2db54c8c..37eaaa3c 100644 --- a/energy-tests/compose-postgres.yml +++ b/energy-tests/compose-postgres.yml @@ -29,6 +29,8 @@ services: - POSTGRES_DB=nextcloud - POSTGRES_USER=nextcloud - POSTGRES_HOST=db - healthcheck: - test: ["curl", "-f", "http://nc"] - interval: "1s" +# healthcheck: +# test: curl -f http://nc +# interval: "1h" # effectively turns repeated healthchecks during runtime off +# start-period: "1s" # Not yet supported. Will come with Docker CE 25.0 +# start-interval: "1s" # Not yet supported. Will come with Docker CE 25.0 diff --git a/energy-tests/compose-sqlite.yml b/energy-tests/compose-sqlite.yml index 566dd4a2..6f77c6d6 100644 --- a/energy-tests/compose-sqlite.yml +++ b/energy-tests/compose-sqlite.yml @@ -8,6 +8,8 @@ services: - 8080:80 #volumes: # - nextcloud:/var/www/html # This is the usual way of using nextcloud in a container, but we do not need persistent data storage for benchmarking - healthcheck: - test: ["curl", "-f", "http://nc"] - interval: "1s" +# healthcheck: +# test: curl -f http://nc +# interval: "1h" # effectively turns repeated healthchecks during runtime off +# start-period: "1s" # Not yet supported. Will come with Docker CE 25.0 +# start-interval: "1s" # Not yet supported. Will come with Docker CE 25.0 diff --git a/energy-tests/usage_scenario-fpm-mariadb-event-chromium.yml b/energy-tests/usage_scenario-fpm-mariadb-event-chromium.yml index 7d143a01..752512e8 100644 --- a/energy-tests/usage_scenario-fpm-mariadb-event-chromium.yml +++ b/energy-tests/usage_scenario-fpm-mariadb-event-chromium.yml @@ -9,7 +9,7 @@ services: image: greencoding/gcb_playwright:v3 depends_on: nc: - condition: service_healthy + condition: service_started # change to service_healthy when Docker CE 25.0 is released which supports start-interval volumes: - /tmp/.X11-unix:/tmp/.X11-unix # for debugging in non-headless mode environment: diff --git a/energy-tests/usage_scenario-fpm-mariadb-talk-chromium.yml b/energy-tests/usage_scenario-fpm-mariadb-talk-chromium.yml index 7509f883..24b4827a 100644 --- a/energy-tests/usage_scenario-fpm-mariadb-talk-chromium.yml +++ b/energy-tests/usage_scenario-fpm-mariadb-talk-chromium.yml @@ -12,7 +12,7 @@ services: image: greencoding/gcb_playwright:v3 depends_on: nc: - condition: service_healthy + condition: service_started # change to service_healthy when Docker CE 25.0 is released which supports start-interval volumes: - /tmp/.X11-unix:/tmp/.X11-unix # for debugging in non-headless mode environment: diff --git a/energy-tests/usage_scenario-mariadb-docs-chromium.yml b/energy-tests/usage_scenario-mariadb-docs-chromium.yml index 76d77876..f3249dab 100644 --- a/energy-tests/usage_scenario-mariadb-docs-chromium.yml +++ b/energy-tests/usage_scenario-mariadb-docs-chromium.yml @@ -12,7 +12,7 @@ services: image: greencoding/gcb_playwright:v3 depends_on: nc: - condition: service_healthy + condition: service_started # change to service_healthy when Docker CE 25.0 is released which supports start-interval volumes: - /tmp/.X11-unix:/tmp/.X11-unix # for debugging in non-headless mode environment: diff --git a/energy-tests/usage_scenario-mariadb-docs-firefox.yml b/energy-tests/usage_scenario-mariadb-docs-firefox.yml index 66391a6f..e5f3495f 100644 --- a/energy-tests/usage_scenario-mariadb-docs-firefox.yml +++ b/energy-tests/usage_scenario-mariadb-docs-firefox.yml @@ -12,7 +12,7 @@ services: image: greencoding/gcb_playwright:v3 depends_on: nc: - condition: service_healthy + condition: service_started # change to service_healthy when Docker CE 25.0 is released which supports start-interval volumes: - /tmp/.X11-unix:/tmp/.X11-unix # for debugging in non-headless mode environment: diff --git a/energy-tests/usage_scenario-mariadb-event-chromium.yml b/energy-tests/usage_scenario-mariadb-event-chromium.yml index f2e074f7..05f7df91 100644 --- a/energy-tests/usage_scenario-mariadb-event-chromium.yml +++ b/energy-tests/usage_scenario-mariadb-event-chromium.yml @@ -9,7 +9,7 @@ services: image: greencoding/gcb_playwright:v3 depends_on: nc: - condition: service_healthy + condition: service_started # change to service_healthy when Docker CE 25.0 is released which supports start-interval volumes: - /tmp/.X11-unix:/tmp/.X11-unix # for debugging in non-headless mode environment: diff --git a/energy-tests/usage_scenario-mariadb-event-firefox.yml b/energy-tests/usage_scenario-mariadb-event-firefox.yml index adc33ca8..8161612e 100644 --- a/energy-tests/usage_scenario-mariadb-event-firefox.yml +++ b/energy-tests/usage_scenario-mariadb-event-firefox.yml @@ -9,7 +9,7 @@ services: image: greencoding/gcb_playwright:v3 depends_on: nc: - condition: service_healthy + condition: service_started # change to service_healthy when Docker CE 25.0 is released which supports start-interval volumes: - /tmp/.X11-unix:/tmp/.X11-unix # for debugging in non-headless mode environment: diff --git a/energy-tests/usage_scenario-mariadb-talk-chromium.yml b/energy-tests/usage_scenario-mariadb-talk-chromium.yml index 958b7e1c..65cf4a05 100644 --- a/energy-tests/usage_scenario-mariadb-talk-chromium.yml +++ b/energy-tests/usage_scenario-mariadb-talk-chromium.yml @@ -12,7 +12,7 @@ services: image: greencoding/gcb_playwright:v3 depends_on: nc: - condition: service_healthy + condition: service_started # change to service_healthy when Docker CE 25.0 is released which supports start-interval volumes: - /tmp/.X11-unix:/tmp/.X11-unix # for debugging in non-headless mode environment: diff --git a/energy-tests/usage_scenario-mariadb-talk-firefox.yml b/energy-tests/usage_scenario-mariadb-talk-firefox.yml index c735dd3d..5f665a94 100644 --- a/energy-tests/usage_scenario-mariadb-talk-firefox.yml +++ b/energy-tests/usage_scenario-mariadb-talk-firefox.yml @@ -12,7 +12,7 @@ services: image: greencoding/gcb_playwright:v3 depends_on: nc: - condition: service_healthy + condition: service_started # change to service_healthy when Docker CE 25.0 is released which supports start-interval volumes: - /tmp/.X11-unix:/tmp/.X11-unix # for debugging in non-headless mode environment: diff --git a/energy-tests/usage_scenario-postgres-docs-chromium.yml b/energy-tests/usage_scenario-postgres-docs-chromium.yml index 0f5047d8..2fa72134 100644 --- a/energy-tests/usage_scenario-postgres-docs-chromium.yml +++ b/energy-tests/usage_scenario-postgres-docs-chromium.yml @@ -12,7 +12,7 @@ services: image: greencoding/gcb_playwright:v3 depends_on: nc: - condition: service_healthy + condition: service_started # change to service_healthy when Docker CE 25.0 is released which supports start-interval volumes: - /tmp/.X11-unix:/tmp/.X11-unix # for debugging in non-headless mode environment: diff --git a/energy-tests/usage_scenario-postgres-docs-firefox.yml b/energy-tests/usage_scenario-postgres-docs-firefox.yml index e1c55c81..0ad2b327 100644 --- a/energy-tests/usage_scenario-postgres-docs-firefox.yml +++ b/energy-tests/usage_scenario-postgres-docs-firefox.yml @@ -12,7 +12,7 @@ services: image: greencoding/gcb_playwright:v3 depends_on: nc: - condition: service_healthy + condition: service_started # change to service_healthy when Docker CE 25.0 is released which supports start-interval volumes: - /tmp/.X11-unix:/tmp/.X11-unix # for debugging in non-headless mode environment: diff --git a/energy-tests/usage_scenario-postgres-event-chromium.yml b/energy-tests/usage_scenario-postgres-event-chromium.yml index 49077132..a493ffe3 100644 --- a/energy-tests/usage_scenario-postgres-event-chromium.yml +++ b/energy-tests/usage_scenario-postgres-event-chromium.yml @@ -9,7 +9,7 @@ services: image: greencoding/gcb_playwright:v3 depends_on: nc: - condition: service_healthy + condition: service_started # change to service_healthy when Docker CE 25.0 is released which supports start-interval volumes: - /tmp/.X11-unix:/tmp/.X11-unix # for debugging in non-headless mode environment: diff --git a/energy-tests/usage_scenario-postgres-event-firefox.yml b/energy-tests/usage_scenario-postgres-event-firefox.yml index 2ca2aabf..f885c290 100644 --- a/energy-tests/usage_scenario-postgres-event-firefox.yml +++ b/energy-tests/usage_scenario-postgres-event-firefox.yml @@ -9,7 +9,7 @@ services: image: greencoding/gcb_playwright:v3 depends_on: nc: - condition: service_healthy + condition: service_started # change to service_healthy when Docker CE 25.0 is released which supports start-interval volumes: - /tmp/.X11-unix:/tmp/.X11-unix # for debugging in non-headless mode environment: diff --git a/energy-tests/usage_scenario-postgres-talk-chromium.yml b/energy-tests/usage_scenario-postgres-talk-chromium.yml index ab29fe5a..bf55817f 100644 --- a/energy-tests/usage_scenario-postgres-talk-chromium.yml +++ b/energy-tests/usage_scenario-postgres-talk-chromium.yml @@ -12,7 +12,7 @@ services: image: greencoding/gcb_playwright:v3 depends_on: nc: - condition: service_healthy + condition: service_started # change to service_healthy when Docker CE 25.0 is released which supports start-interval volumes: - /tmp/.X11-unix:/tmp/.X11-unix # for debugging in non-headless mode environment: diff --git a/energy-tests/usage_scenario-postgres-talk-firefox.yml b/energy-tests/usage_scenario-postgres-talk-firefox.yml index 60a6df48..75a052e2 100644 --- a/energy-tests/usage_scenario-postgres-talk-firefox.yml +++ b/energy-tests/usage_scenario-postgres-talk-firefox.yml @@ -12,7 +12,7 @@ services: image: greencoding/gcb_playwright:v3 depends_on: nc: - condition: service_healthy + condition: service_started # change to service_healthy when Docker CE 25.0 is released which supports start-interval volumes: - /tmp/.X11-unix:/tmp/.X11-unix # for debugging in non-headless mode environment: diff --git a/energy-tests/usage_scenario-sqlite-docs-chromium.yml b/energy-tests/usage_scenario-sqlite-docs-chromium.yml index 23d8a5c7..47654d17 100644 --- a/energy-tests/usage_scenario-sqlite-docs-chromium.yml +++ b/energy-tests/usage_scenario-sqlite-docs-chromium.yml @@ -12,7 +12,7 @@ services: image: greencoding/gcb_playwright:v3 depends_on: nc: - condition: service_healthy + condition: service_started # change to service_healthy when Docker CE 25.0 is released which supports start-interval volumes: - /tmp/.X11-unix:/tmp/.X11-unix # for debugging in non-headless mode environment: diff --git a/energy-tests/usage_scenario-sqlite-docs-firefox.yml b/energy-tests/usage_scenario-sqlite-docs-firefox.yml index ac75f7cd..00b4fdea 100644 --- a/energy-tests/usage_scenario-sqlite-docs-firefox.yml +++ b/energy-tests/usage_scenario-sqlite-docs-firefox.yml @@ -12,7 +12,7 @@ services: image: greencoding/gcb_playwright:v3 depends_on: nc: - condition: service_healthy + condition: service_started # change to service_healthy when Docker CE 25.0 is released which supports start-interval volumes: - /tmp/.X11-unix:/tmp/.X11-unix # for debugging in non-headless mode environment: diff --git a/energy-tests/usage_scenario-sqlite-event-chromium.yml b/energy-tests/usage_scenario-sqlite-event-chromium.yml index d5275590..e98fff1d 100644 --- a/energy-tests/usage_scenario-sqlite-event-chromium.yml +++ b/energy-tests/usage_scenario-sqlite-event-chromium.yml @@ -9,7 +9,7 @@ services: image: greencoding/gcb_playwright:v3 depends_on: nc: - condition: service_healthy + condition: service_started # change to service_healthy when Docker CE 25.0 is released which supports start-interval volumes: - /tmp/.X11-unix:/tmp/.X11-unix # for debugging in non-headless mode environment: diff --git a/energy-tests/usage_scenario-sqlite-event-firefox.yml b/energy-tests/usage_scenario-sqlite-event-firefox.yml index d5ab910c..8f024027 100644 --- a/energy-tests/usage_scenario-sqlite-event-firefox.yml +++ b/energy-tests/usage_scenario-sqlite-event-firefox.yml @@ -9,7 +9,7 @@ services: image: greencoding/gcb_playwright:v3 depends_on: nc: - condition: service_healthy + condition: service_started # change to service_healthy when Docker CE 25.0 is released which supports start-interval volumes: - /tmp/.X11-unix:/tmp/.X11-unix # for debugging in non-headless mode environment: diff --git a/energy-tests/usage_scenario-sqlite-talk-chromium.yml b/energy-tests/usage_scenario-sqlite-talk-chromium.yml index a84d97aa..42dada6b 100644 --- a/energy-tests/usage_scenario-sqlite-talk-chromium.yml +++ b/energy-tests/usage_scenario-sqlite-talk-chromium.yml @@ -12,7 +12,7 @@ services: image: greencoding/gcb_playwright:v3 depends_on: nc: - condition: service_healthy + condition: service_started # change to service_healthy when Docker CE 25.0 is released which supports start-interval volumes: - /tmp/.X11-unix:/tmp/.X11-unix # for debugging in non-headless mode environment: diff --git a/energy-tests/usage_scenario-sqlite-talk-firefox.yml b/energy-tests/usage_scenario-sqlite-talk-firefox.yml index 7d7d3610..406b7e92 100644 --- a/energy-tests/usage_scenario-sqlite-talk-firefox.yml +++ b/energy-tests/usage_scenario-sqlite-talk-firefox.yml @@ -12,7 +12,7 @@ services: image: greencoding/gcb_playwright:v3 depends_on: nc: - condition: service_healthy + condition: service_started # change to service_healthy when Docker CE 25.0 is released which supports start-interval volumes: - /tmp/.X11-unix:/tmp/.X11-unix # for debugging in non-headless mode environment: