Skip to content

Commit 7f1fbf1

Browse files
authored
Merge pull request #1738 from lsst-it/IT-6140_bump_docker_version
(site/common) bump docker version
2 parents bcdcaf8 + 86b7cec commit 7f1fbf1

File tree

7 files changed

+2
-11
lines changed

7 files changed

+2
-11
lines changed

hieradata/site/cp.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ profile::core::firewall::firewall:
6565
dport: "9100"
6666
jump: "accept"
6767

68-
profile::core::docker::version: "24.0.9"
69-
7068
ccs_sal::dds: false
7169
ccs_sal::kafka: true
7270
ccs_sal::kafka_broker_address: "sasquatch-summit-kafka-bootstrap.lsst.codes:9094"

hieradata/site/dev.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,3 @@ profile::core::firewall::firewall:
7777
ipset: "dev src" # allow ruka to access node_exporter
7878
dport: "9100"
7979
jump: "accept"
80-
81-
profile::core::docker::version: "24.0.9"

hieradata/site/ls.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ profile::core::firewall::firewall:
6262
dport: "9100"
6363
jump: "accept"
6464

65-
profile::core::docker::version: "24.0.9"
66-
6765
ccs_sal::dds: false
6866
ccs_sal::kafka: true
6967

hieradata/site/ls/role/rke.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
---
2-
profile::core::docker::version: "24.0.9"
32
profile::core::rke::version: "1.7.6"

hieradata/site/tu/role/rke.yaml

Lines changed: 0 additions & 2 deletions
This file was deleted.

site/profile/data/common.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ profile::core::yum::lsst_ts_private::repos:
144144
gpgcheck: false
145145
target: "/etc/yum.repos.d/lsst-ts-private.repo"
146146

147-
profile::core::docker::version: "23.0.6"
147+
profile::core::docker::version: "24.0.9"
148148

149149
profile::core::sysctl::lhn::sysctls:
150150
# lhn tuning

spec/classes/core/docker_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
it { is_expected.to compile.with_all_deps }
1111

12-
include_examples 'docker', docker_version: '23.0.6'
12+
include_examples 'docker', docker_version: '24.0.9'
1313

1414
it do
1515
is_expected.to contain_systemd__dropin_file('wait-for-docker-group.conf').with(

0 commit comments

Comments
 (0)