From df0b334edc4205ccb9ae3cb236171828372a8fb3 Mon Sep 17 00:00:00 2001 From: Patrik Holmqvist Date: Tue, 25 Mar 2025 16:04:14 +0100 Subject: [PATCH] Some compose file fixes for telegraf, SC-2522 --- .../eid/templates/telegraf2/docker-compose.yml.erb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/global/overlay/etc/puppet/modules/eid/templates/telegraf2/docker-compose.yml.erb b/global/overlay/etc/puppet/modules/eid/templates/telegraf2/docker-compose.yml.erb index 2544123c..eaa0d6ce 100644 --- a/global/overlay/etc/puppet/modules/eid/templates/telegraf2/docker-compose.yml.erb +++ b/global/overlay/etc/puppet/modules/eid/templates/telegraf2/docker-compose.yml.erb @@ -1,7 +1,7 @@ --- services: telegraf: - image: docker.sunet.se/test-my-eid:<%= @version %> + image: docker.sunet.se/eduid/telegraf:<%= @version %> container_name: telegraf environment: - INFLUXDB2_TOKEN=<%= @influxdb2_token %> @@ -18,8 +18,10 @@ services: - '/etc/ssl:/etc/ssl' - '/dev/log:/dev/log' - '/var/log:/var/log' - - <%= @service_dir %>:<%= @service_dir %> + - '<%= @service_dir %>:<%= @service_dir %>' - '/var/run/utmp:/var/run/utmp:ro' +<% if @ports != [] -%> ports: - - <%= @ports %> \ No newline at end of file + - <%= @ports %> +<% end -%>