diff --git a/compose/auth_proxy.yml b/compose/auth_proxy.yml index a6913e17b..370583841 100644 --- a/compose/auth_proxy.yml +++ b/compose/auth_proxy.yml @@ -1,4 +1,3 @@ -version: "3" services: cryostat: expose: diff --git a/compose/auth_proxy_https.yml b/compose/auth_proxy_https.yml index d3b7a24af..78da10e8b 100644 --- a/compose/auth_proxy_https.yml +++ b/compose/auth_proxy_https.yml @@ -1,4 +1,3 @@ -version: "3" services: cryostat: environment: diff --git a/compose/cryostat-grafana.yml b/compose/cryostat-grafana.yml index 37d376180..5fbeedd50 100644 --- a/compose/cryostat-grafana.yml +++ b/compose/cryostat-grafana.yml @@ -1,4 +1,3 @@ -version: "3" services: cryostat: environment: diff --git a/compose/cryostat.yml b/compose/cryostat.yml index aca539c61..9c533926e 100644 --- a/compose/cryostat.yml +++ b/compose/cryostat.yml @@ -1,4 +1,3 @@ -version: "3" services: cryostat: deploy: @@ -36,14 +35,12 @@ services: -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.local.only=false restart: unless-stopped - # FIXME reenable this check. Somehow after upgrading to Quarkus 3.8, this check fails with 'connection refused', - # but the container comes up successfully without it and shelling into the container later to run curl succeeds - # healthcheck: - # test: curl --fail http://cryostat:${CRYOSTAT_HTTP_PORT}/health/liveness || exit 1 - # interval: 10s - # retries: 3 - # start_period: 30s - # timeout: 5s + healthcheck: + test: curl --fail http://cryostat:${CRYOSTAT_HTTP_PORT}/health/liveness || exit 1 + interval: 10s + retries: 3 + start_period: 30s + timeout: 5s volumes: jmxtls_cfg: diff --git a/compose/cryostat_docker.yml b/compose/cryostat_docker.yml index 2060bfd63..2ae890388 100644 --- a/compose/cryostat_docker.yml +++ b/compose/cryostat_docker.yml @@ -1,4 +1,3 @@ -version: "3" services: cryostat: depends_on: diff --git a/compose/cryostat_k8s.yml b/compose/cryostat_k8s.yml index 9c99e84ae..c104c8fd9 100644 --- a/compose/cryostat_k8s.yml +++ b/compose/cryostat_k8s.yml @@ -1,4 +1,3 @@ -version: "3" services: cryostat: depends_on: diff --git a/compose/db-viewer.yml b/compose/db-viewer.yml index c2f20c273..08dce14c1 100644 --- a/compose/db-viewer.yml +++ b/compose/db-viewer.yml @@ -1,4 +1,3 @@ -version: "3" services: db-viewer: depends_on: diff --git a/compose/db.yml b/compose/db.yml index 02e015fdb..752bbc853 100644 --- a/compose/db.yml +++ b/compose/db.yml @@ -1,4 +1,3 @@ -version: "3" services: cryostat: depends_on: diff --git a/compose/grafana_no_proxy.yml b/compose/grafana_no_proxy.yml index 577834e8f..d6affb5f9 100644 --- a/compose/grafana_no_proxy.yml +++ b/compose/grafana_no_proxy.yml @@ -1,4 +1,3 @@ -version: "3" services: cryostat: environment: diff --git a/compose/jfr-datasource.yml b/compose/jfr-datasource.yml index cc190cf08..54bda40ad 100644 --- a/compose/jfr-datasource.yml +++ b/compose/jfr-datasource.yml @@ -1,4 +1,3 @@ -version: "3" services: cryostat: environment: diff --git a/compose/no_proxy.yml b/compose/no_proxy.yml index 3b166319e..694659cc1 100644 --- a/compose/no_proxy.yml +++ b/compose/no_proxy.yml @@ -1,4 +1,3 @@ -version: "3" services: cryostat: hostname: cryostat diff --git a/compose/reports.yml b/compose/reports.yml index cd51e5129..b8a97578f 100644 --- a/compose/reports.yml +++ b/compose/reports.yml @@ -1,4 +1,3 @@ -version: "3" services: cryostat: environment: diff --git a/compose/s3-cloudserver.yml b/compose/s3-cloudserver.yml index 2cd9de37e..8b5d1f9da 100644 --- a/compose/s3-cloudserver.yml +++ b/compose/s3-cloudserver.yml @@ -1,4 +1,3 @@ -version: "3" services: cryostat: depends_on: diff --git a/compose/s3-localstack.yml b/compose/s3-localstack.yml index 574b24878..0e24b4115 100644 --- a/compose/s3-localstack.yml +++ b/compose/s3-localstack.yml @@ -1,4 +1,3 @@ -version: "3" services: cryostat: depends_on: diff --git a/compose/s3-minio.yml b/compose/s3-minio.yml index 4d3dfca9c..6bf28805d 100644 --- a/compose/s3-minio.yml +++ b/compose/s3-minio.yml @@ -1,4 +1,3 @@ -version: "3" services: cryostat: depends_on: diff --git a/compose/s3-none.yml b/compose/s3-none.yml index e1da591be..57680acf3 100644 --- a/compose/s3-none.yml +++ b/compose/s3-none.yml @@ -1,4 +1,3 @@ -version: "3" services: cryostat: environment: diff --git a/compose/s3-seaweed.yml b/compose/s3-seaweed.yml index 0aa97502b..72e0d5d77 100644 --- a/compose/s3-seaweed.yml +++ b/compose/s3-seaweed.yml @@ -1,4 +1,3 @@ -version: "3" services: cryostat: depends_on: diff --git a/compose/s3_no_proxy.yml b/compose/s3_no_proxy.yml index b47d0f631..930d43c6d 100644 --- a/compose/s3_no_proxy.yml +++ b/compose/s3_no_proxy.yml @@ -1,4 +1,3 @@ -version: "3" services: s3: ports: diff --git a/compose/sample_apps/gameserver-jdk11.yml b/compose/sample_apps/gameserver-jdk11.yml index 92956c723..8cbb49db3 100644 --- a/compose/sample_apps/gameserver-jdk11.yml +++ b/compose/sample_apps/gameserver-jdk11.yml @@ -1,4 +1,3 @@ -version: "3" services: gameserver-jdk11: depends_on: diff --git a/compose/sample_apps/gameserver-jdk17.yml b/compose/sample_apps/gameserver-jdk17.yml index 01ebd5e7a..2cf0a35f1 100644 --- a/compose/sample_apps/gameserver-jdk17.yml +++ b/compose/sample_apps/gameserver-jdk17.yml @@ -1,4 +1,3 @@ -version: "3" services: gameserver-jdk17: depends_on: diff --git a/compose/sample_apps/gameserver-jdk21.yml b/compose/sample_apps/gameserver-jdk21.yml index 8ef9555e4..96f989ffa 100644 --- a/compose/sample_apps/gameserver-jdk21.yml +++ b/compose/sample_apps/gameserver-jdk21.yml @@ -1,4 +1,3 @@ -version: "3" services: gameserver-jdk21: depends_on: diff --git a/compose/sample_apps/opensearch.yml b/compose/sample_apps/opensearch.yml index e057e330d..c295eaca2 100644 --- a/compose/sample_apps/opensearch.yml +++ b/compose/sample_apps/opensearch.yml @@ -1,4 +1,3 @@ -version: "3" services: opensearch-node: image: docker.io/opensearchproject/opensearch:latest diff --git a/compose/sample_apps/quarkus-cryostat-agent.yml b/compose/sample_apps/quarkus-cryostat-agent.yml index 2342abeed..567fcdc4d 100644 --- a/compose/sample_apps/quarkus-cryostat-agent.yml +++ b/compose/sample_apps/quarkus-cryostat-agent.yml @@ -1,4 +1,3 @@ -version: "3" services: quarkus-cryostat-agent: image: ${QUARKUS_TEST_IMAGE:-quay.io/redhat-java-monitoring/quarkus-cryostat-agent:latest} diff --git a/compose/sample_apps/quarkus-cryostat-agent_https.yml b/compose/sample_apps/quarkus-cryostat-agent_https.yml index 8141b6b02..930f53675 100644 --- a/compose/sample_apps/quarkus-cryostat-agent_https.yml +++ b/compose/sample_apps/quarkus-cryostat-agent_https.yml @@ -1,4 +1,3 @@ -version: "3" services: quarkus-cryostat-agent: environment: diff --git a/compose/sample_apps/spring-boot-2-7.yml b/compose/sample_apps/spring-boot-2-7.yml index a3af2ad4a..cf1639749 100644 --- a/compose/sample_apps/spring-boot-2-7.yml +++ b/compose/sample_apps/spring-boot-2-7.yml @@ -1,4 +1,3 @@ -version: "3" services: spring-boot-2-7: depends_on: diff --git a/compose/sample_apps/spring-boot-3.yml b/compose/sample_apps/spring-boot-3.yml index 7e801736b..7ab25b586 100644 --- a/compose/sample_apps/spring-boot-3.yml +++ b/compose/sample_apps/spring-boot-3.yml @@ -1,4 +1,3 @@ -version: "3" services: spring-boot-3: depends_on: diff --git a/compose/sample_apps/vertx-cryostat-agent.yml b/compose/sample_apps/vertx-cryostat-agent.yml index cdcdf6179..862c25faf 100644 --- a/compose/sample_apps/vertx-cryostat-agent.yml +++ b/compose/sample_apps/vertx-cryostat-agent.yml @@ -1,4 +1,3 @@ -version: "3" services: vertx-agent-1: depends_on: diff --git a/compose/sample_apps/wildfly-23.yml b/compose/sample_apps/wildfly-23.yml index c8988717b..b649e6f92 100644 --- a/compose/sample_apps/wildfly-23.yml +++ b/compose/sample_apps/wildfly-23.yml @@ -1,4 +1,3 @@ -version: "3" services: wildfly-23: depends_on: diff --git a/compose/sample_apps/wildfly-28.yml b/compose/sample_apps/wildfly-28.yml index 7f236a0b4..79156f6a6 100644 --- a/compose/sample_apps/wildfly-28.yml +++ b/compose/sample_apps/wildfly-28.yml @@ -1,4 +1,3 @@ -version: "3" services: wildfly-28: depends_on: