From 0a83d01167ce24313fa00cf62e90e4805b04c4f2 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 20 Mar 2025 09:32:28 -0700 Subject: [PATCH] Cleanup docker-compose.yaml versions in Noble services On Ubuntu Noble we run `docker compose` instead of `docker-compose`. This newer tool ignores the version set in docker-compose.yaml files and emits a warning when it is set. Clean up this version on services that only run with `docker compose` and not `docker-compose`. Change-Id: I08ce1f2ddc6a07fd47b4524af21255c1c4903785 --- playbooks/roles/codesearch/templates/docker-compose.yaml.j2 | 2 -- playbooks/roles/grafana/templates/docker-compose.yaml.j2 | 4 ---- playbooks/roles/jaeger/templates/docker-compose.yaml.j2 | 4 ---- playbooks/roles/lodgeit/templates/docker-compose.yaml.j2 | 2 -- 4 files changed, 12 deletions(-) diff --git a/playbooks/roles/codesearch/templates/docker-compose.yaml.j2 b/playbooks/roles/codesearch/templates/docker-compose.yaml.j2 index 544b3bd0f3..03543d9598 100644 --- a/playbooks/roles/codesearch/templates/docker-compose.yaml.j2 +++ b/playbooks/roles/codesearch/templates/docker-compose.yaml.j2 @@ -1,5 +1,3 @@ -version: '3' - services: hound: restart: always diff --git a/playbooks/roles/grafana/templates/docker-compose.yaml.j2 b/playbooks/roles/grafana/templates/docker-compose.yaml.j2 index 1bae5667af..ddd39b47be 100644 --- a/playbooks/roles/grafana/templates/docker-compose.yaml.j2 +++ b/playbooks/roles/grafana/templates/docker-compose.yaml.j2 @@ -1,7 +1,3 @@ -# Version 2 is the latest that is supported by docker-compose in -# Ubuntu Xenial. -version: '2' - services: grafana: restart: always diff --git a/playbooks/roles/jaeger/templates/docker-compose.yaml.j2 b/playbooks/roles/jaeger/templates/docker-compose.yaml.j2 index 4842e1c4fb..ab038b7184 100644 --- a/playbooks/roles/jaeger/templates/docker-compose.yaml.j2 +++ b/playbooks/roles/jaeger/templates/docker-compose.yaml.j2 @@ -1,7 +1,3 @@ -# Version 2 is the latest that is supported by docker-compose in -# Ubuntu Xenial. -version: '2' - services: jaeger: image: docker.io/jaegertracing/all-in-one:1.58.1 diff --git a/playbooks/roles/lodgeit/templates/docker-compose.yaml.j2 b/playbooks/roles/lodgeit/templates/docker-compose.yaml.j2 index 71f58c4a0d..4a57076113 100644 --- a/playbooks/roles/lodgeit/templates/docker-compose.yaml.j2 +++ b/playbooks/roles/lodgeit/templates/docker-compose.yaml.j2 @@ -1,5 +1,3 @@ -version: '2' - services: mariadb: image: quay.io/opendevmirror/mariadb:10.11