From b3208e6076cae71c482c42aaf2f3e25bbcbdd608 Mon Sep 17 00:00:00 2001 From: Jan David Mol <mol@astron.nl> Date: Thu, 16 Jun 2022 15:11:03 +0200 Subject: [PATCH] Make yml format versions uniform --- docker-compose/apsct-sim.yml | 2 +- docker-compose/apspu-sim.yml | 2 +- docker-compose/archiver-timescale.yml | 2 +- docker-compose/device-antennafield.yml | 2 +- docker-compose/device-apsct.yml | 2 +- docker-compose/device-apspu.yml | 2 +- docker-compose/device-beamlet.yml | 2 +- docker-compose/device-boot.yml | 2 +- docker-compose/device-bst.yml | 2 +- docker-compose/device-digitalbeam.yml | 2 +- docker-compose/device-docker.yml | 2 +- docker-compose/device-observation.yml | 2 +- docker-compose/device-observation_control.yml | 2 +- docker-compose/device-pdu.yml | 2 +- docker-compose/device-recv.yml | 2 +- docker-compose/device-sdp.yml | 2 +- docker-compose/device-sst.yml | 2 +- docker-compose/device-temperature-manager.yml | 2 +- docker-compose/device-tilebeam.yml | 2 +- docker-compose/device-unb2.yml | 2 +- docker-compose/device-xst.yml | 2 +- docker-compose/elk.yml | 2 +- docker-compose/grafana.yml | 2 +- docker-compose/integration-test.yml | 2 +- docker-compose/itango.yml | 2 +- docker-compose/jupyter.yml | 2 +- docker-compose/lofar-device-base.yml | 2 +- docker-compose/networks.yml | 2 +- docker-compose/prometheus-node-exporter.yml | 2 +- docker-compose/prometheus.yml | 2 +- docker-compose/recv-sim.yml | 2 +- docker-compose/rest.yml | 2 +- docker-compose/sdptr-sim.yml | 2 +- docker-compose/tango-prometheus-exporter.yml | 2 +- docker-compose/tango.yml | 2 +- docker-compose/unb2-sim.yml | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-) diff --git a/docker-compose/apsct-sim.yml b/docker-compose/apsct-sim.yml index 00146bfc8..9dc5c14a9 100644 --- a/docker-compose/apsct-sim.yml +++ b/docker-compose/apsct-sim.yml @@ -4,7 +4,7 @@ # Defines: # - apsct-sim # -version: '2' +version: '2.1' services: apsct-sim: diff --git a/docker-compose/apspu-sim.yml b/docker-compose/apspu-sim.yml index 62ba7267c..0f164a5a3 100644 --- a/docker-compose/apspu-sim.yml +++ b/docker-compose/apspu-sim.yml @@ -4,7 +4,7 @@ # Defines: # - apspu-sim # -version: '2' +version: '2.1' services: apspu-sim: diff --git a/docker-compose/archiver-timescale.yml b/docker-compose/archiver-timescale.yml index 7d0bd2ea3..cdbf1b037 100644 --- a/docker-compose/archiver-timescale.yml +++ b/docker-compose/archiver-timescale.yml @@ -1,4 +1,4 @@ -version: '2' +version: '2.1' volumes: archiver-timescale-data: {} diff --git a/docker-compose/device-antennafield.yml b/docker-compose/device-antennafield.yml index de2d65c06..d33dacac0 100644 --- a/docker-compose/device-antennafield.yml +++ b/docker-compose/device-antennafield.yml @@ -10,7 +10,7 @@ # Requires: # - lofar-device-base.yml # -version: '2' +version: '2.1' services: diff --git a/docker-compose/device-apsct.yml b/docker-compose/device-apsct.yml index 57799c0db..cb43adf7b 100644 --- a/docker-compose/device-apsct.yml +++ b/docker-compose/device-apsct.yml @@ -10,7 +10,7 @@ # Requires: # - lofar-device-base.yml # -version: '2' +version: '2.1' services: device-apsct: diff --git a/docker-compose/device-apspu.yml b/docker-compose/device-apspu.yml index e4f4e5a0c..6613b2109 100644 --- a/docker-compose/device-apspu.yml +++ b/docker-compose/device-apspu.yml @@ -10,7 +10,7 @@ # Requires: # - lofar-device-base.yml # -version: '2' +version: '2.1' services: device-apspu: diff --git a/docker-compose/device-beamlet.yml b/docker-compose/device-beamlet.yml index d54366ccf..6d067c154 100644 --- a/docker-compose/device-beamlet.yml +++ b/docker-compose/device-beamlet.yml @@ -10,7 +10,7 @@ # Requires: # - lofar-device-base.yml # -version: '2' +version: '2.1' services: device-beamlet: diff --git a/docker-compose/device-boot.yml b/docker-compose/device-boot.yml index 339b88f4d..0388c0822 100644 --- a/docker-compose/device-boot.yml +++ b/docker-compose/device-boot.yml @@ -9,7 +9,7 @@ # Requires: # - lofar-device-base.yml # -version: '2' +version: '2.1' services: device-boot: diff --git a/docker-compose/device-bst.yml b/docker-compose/device-bst.yml index 57ef90b8f..c06514b4f 100644 --- a/docker-compose/device-bst.yml +++ b/docker-compose/device-bst.yml @@ -10,7 +10,7 @@ # Requires: # - lofar-device-base.yml # -version: '2' +version: '2.1' services: device-bst: diff --git a/docker-compose/device-digitalbeam.yml b/docker-compose/device-digitalbeam.yml index 81930a0f2..32847ca8d 100644 --- a/docker-compose/device-digitalbeam.yml +++ b/docker-compose/device-digitalbeam.yml @@ -10,7 +10,7 @@ # Requires: # - lofar-device-base.yml # -version: '2' +version: '2.1' services: device-digitalbeam: diff --git a/docker-compose/device-docker.yml b/docker-compose/device-docker.yml index 7cb990b97..2be9467ea 100644 --- a/docker-compose/device-docker.yml +++ b/docker-compose/device-docker.yml @@ -10,7 +10,7 @@ # Requires: # - lofar-device-base.yml # -version: '2' +version: '2.1' services: device-docker: diff --git a/docker-compose/device-observation.yml b/docker-compose/device-observation.yml index 28beae499..ee8f3a165 100644 --- a/docker-compose/device-observation.yml +++ b/docker-compose/device-observation.yml @@ -8,7 +8,7 @@ # Requires: # - lofar-device-base.yml # -version: '2' +version: '2.1' services: device-observation: diff --git a/docker-compose/device-observation_control.yml b/docker-compose/device-observation_control.yml index 3887560cd..4c84af792 100644 --- a/docker-compose/device-observation_control.yml +++ b/docker-compose/device-observation_control.yml @@ -9,7 +9,7 @@ # Requires: # - lofar-device-base.yml # -version: '2' +version: '2.1' services: device-observation_control: diff --git a/docker-compose/device-pdu.yml b/docker-compose/device-pdu.yml index 628a1e0b7..c1c2af57f 100644 --- a/docker-compose/device-pdu.yml +++ b/docker-compose/device-pdu.yml @@ -2,7 +2,7 @@ # Requires: # - lofar-device-base.yml # -version: '2' +version: '2.1' volumes: iers-data: {} diff --git a/docker-compose/device-recv.yml b/docker-compose/device-recv.yml index d3d1ade7a..10126cae3 100644 --- a/docker-compose/device-recv.yml +++ b/docker-compose/device-recv.yml @@ -10,7 +10,7 @@ # Requires: # - lofar-device-base.yml # -version: '2' +version: '2.1' services: device-recv: diff --git a/docker-compose/device-sdp.yml b/docker-compose/device-sdp.yml index 653efb2ad..2e9c77312 100644 --- a/docker-compose/device-sdp.yml +++ b/docker-compose/device-sdp.yml @@ -10,7 +10,7 @@ # Requires: # - lofar-device-base.yml # -version: '2' +version: '2.1' services: device-sdp: diff --git a/docker-compose/device-sst.yml b/docker-compose/device-sst.yml index 10057ee96..54c221f3b 100644 --- a/docker-compose/device-sst.yml +++ b/docker-compose/device-sst.yml @@ -10,7 +10,7 @@ # Requires: # - lofar-device-base.yml # -version: '2' +version: '2.1' services: device-sst: diff --git a/docker-compose/device-temperature-manager.yml b/docker-compose/device-temperature-manager.yml index cf1ac02fd..4729bd631 100644 --- a/docker-compose/device-temperature-manager.yml +++ b/docker-compose/device-temperature-manager.yml @@ -2,7 +2,7 @@ # Requires: # - lofar-device-base.yml # -version: '2' +version: '2.1' volumes: iers-data: {} diff --git a/docker-compose/device-tilebeam.yml b/docker-compose/device-tilebeam.yml index 1d243a6e1..20e44c90c 100644 --- a/docker-compose/device-tilebeam.yml +++ b/docker-compose/device-tilebeam.yml @@ -2,7 +2,7 @@ # Requires: # - lofar-device-base.yml # -version: '2' +version: '2.1' volumes: iers-data: {} diff --git a/docker-compose/device-unb2.yml b/docker-compose/device-unb2.yml index e753f79c2..9a7505f0b 100644 --- a/docker-compose/device-unb2.yml +++ b/docker-compose/device-unb2.yml @@ -10,7 +10,7 @@ # Requires: # - lofar-device-base.yml # -version: '2' +version: '2.1' services: device-unb2: diff --git a/docker-compose/device-xst.yml b/docker-compose/device-xst.yml index cb7ec371e..1ed7a1fe3 100644 --- a/docker-compose/device-xst.yml +++ b/docker-compose/device-xst.yml @@ -10,7 +10,7 @@ # Requires: # - lofar-device-base.yml # -version: '2' +version: '2.1' services: device-xst: diff --git a/docker-compose/elk.yml b/docker-compose/elk.yml index 78345420e..786e843ce 100644 --- a/docker-compose/elk.yml +++ b/docker-compose/elk.yml @@ -7,7 +7,7 @@ # - elk: ELK stack # -version: '2' +version: '2.1' volumes: elk-data: {} diff --git a/docker-compose/grafana.yml b/docker-compose/grafana.yml index 73c508440..16462fcd6 100644 --- a/docker-compose/grafana.yml +++ b/docker-compose/grafana.yml @@ -5,7 +5,7 @@ # - grafana: Grafana # -version: '2' +version: '2.1' #volumes: # grafana-data: {} diff --git a/docker-compose/integration-test.yml b/docker-compose/integration-test.yml index 944f47a35..346bbbcc5 100644 --- a/docker-compose/integration-test.yml +++ b/docker-compose/integration-test.yml @@ -4,7 +4,7 @@ # Defines: # - integration: Integration testing # -version: '2' +version: '2.1' services: integration-test: diff --git a/docker-compose/itango.yml b/docker-compose/itango.yml index 3e3df5a53..9e453cddc 100644 --- a/docker-compose/itango.yml +++ b/docker-compose/itango.yml @@ -10,7 +10,7 @@ # Requires: # - tango.yml # -version: '2' +version: '2.1' services: itango: diff --git a/docker-compose/jupyter.yml b/docker-compose/jupyter.yml index 8bc6eb8ce..0c5356aeb 100644 --- a/docker-compose/jupyter.yml +++ b/docker-compose/jupyter.yml @@ -8,7 +8,7 @@ # - jupyter: Jupyter Notebook with iTango support # -version: '2' +version: '2.1' services: jupyter: diff --git a/docker-compose/lofar-device-base.yml b/docker-compose/lofar-device-base.yml index da0a0c5a9..34f3f1c92 100644 --- a/docker-compose/lofar-device-base.yml +++ b/docker-compose/lofar-device-base.yml @@ -11,7 +11,7 @@ # - tango.yml # -version: '2' +version: '2.1' services: lofar-device-base: diff --git a/docker-compose/networks.yml b/docker-compose/networks.yml index bdacc3005..0799fa1c0 100644 --- a/docker-compose/networks.yml +++ b/docker-compose/networks.yml @@ -1,7 +1,7 @@ # # Docker compose file that describes our docker networks. # -version: '3.5' +version: '2.1' networks: diff --git a/docker-compose/prometheus-node-exporter.yml b/docker-compose/prometheus-node-exporter.yml index da82726fc..a6d5b00f9 100644 --- a/docker-compose/prometheus-node-exporter.yml +++ b/docker-compose/prometheus-node-exporter.yml @@ -4,7 +4,7 @@ # Provides system metrics for Prometheus to scrape # -version: '2' +version: '2.1' services: prometheus-node-exporter: diff --git a/docker-compose/prometheus.yml b/docker-compose/prometheus.yml index f91a1a174..0ccc8adb3 100644 --- a/docker-compose/prometheus.yml +++ b/docker-compose/prometheus.yml @@ -5,7 +5,7 @@ # - prometheus: Prometheus # -version: '2' +version: '2.1' volumes: prometheus-data: {} diff --git a/docker-compose/recv-sim.yml b/docker-compose/recv-sim.yml index 574385ef1..2dfeb4837 100644 --- a/docker-compose/recv-sim.yml +++ b/docker-compose/recv-sim.yml @@ -4,7 +4,7 @@ # Defines: # - recv-sim # -version: '2' +version: '2.1' services: recv-sim: diff --git a/docker-compose/rest.yml b/docker-compose/rest.yml index 94e116845..a1d09ecb3 100644 --- a/docker-compose/rest.yml +++ b/docker-compose/rest.yml @@ -9,7 +9,7 @@ # Requires: # - tango.yml # -version: '2' +version: '2.1' services: rest: diff --git a/docker-compose/sdptr-sim.yml b/docker-compose/sdptr-sim.yml index 112b6d4e5..e9fbdd7a0 100644 --- a/docker-compose/sdptr-sim.yml +++ b/docker-compose/sdptr-sim.yml @@ -4,7 +4,7 @@ # Defines: # - sdptr-sim # -version: '2' +version: '2.1' services: sdptr-sim: diff --git a/docker-compose/tango-prometheus-exporter.yml b/docker-compose/tango-prometheus-exporter.yml index 87ca7109f..5eca2be50 100644 --- a/docker-compose/tango-prometheus-exporter.yml +++ b/docker-compose/tango-prometheus-exporter.yml @@ -1,7 +1,7 @@ # # Docker compose file that launches the Tango -> Prometheus adapter # -version: '2' +version: '2.1' services: tango-prometheus-exporter: diff --git a/docker-compose/tango.yml b/docker-compose/tango.yml index c9cdac909..65cda98f8 100644 --- a/docker-compose/tango.yml +++ b/docker-compose/tango.yml @@ -8,7 +8,7 @@ # Requires: # - None # -version: '2' +version: '2.1' volumes: tangodb: {} diff --git a/docker-compose/unb2-sim.yml b/docker-compose/unb2-sim.yml index b68e1d9c8..e29c80501 100644 --- a/docker-compose/unb2-sim.yml +++ b/docker-compose/unb2-sim.yml @@ -4,7 +4,7 @@ # Defines: # - unb2-sim # -version: '2' +version: '2.1' services: unb2-sim: -- GitLab