Skip to content

Commit 804a267

Browse files
committed
Update docker compose version & deploy it as docker plugin
1 parent 9d18e68 commit 804a267

File tree

2 files changed

+23
-3
lines changed

2 files changed

+23
-3
lines changed

manifests/compose.pp

+21-1
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,17 @@
5656

5757
$docker_compose_location = "${install_path}/${symlink_name}${file_extension}"
5858
$docker_compose_location_versioned = "${install_path}/docker-compose-${version}${file_extension}"
59+
$docker_plugins_path = '/usr/local/lib/docker/cli-plugins'
5960

6061
if $ensure == 'present' {
6162
if $raw_url != undef {
6263
$docker_compose_url = $raw_url
6364
} else {
64-
$docker_compose_url = "${base_url}/${version}/docker-compose-${facts['kernel']}-${facts['os']['hardware']}${file_extension}"
65+
if $version =~ /^2.d+.d+$/ {
66+
$version_prepath = 'v'
67+
}
68+
69+
$docker_compose_url = "${base_url}/${version_prepath}${version}/docker-compose-${facts['kernel']}-${facts['os']['hardware']}${file_extension}"
6570
}
6671

6772
if $proxy != undef {
@@ -97,6 +102,15 @@
97102
require => Package['curl'],
98103
}
99104

105+
file { '/usr/local/lib/docker':
106+
ensure => directory,
107+
}
108+
109+
file { $docker_plugins_path:
110+
ensure => directory,
111+
require => File['/usr/local/lib/docker'],
112+
}
113+
100114
file { $docker_compose_location_versioned:
101115
owner => $file_owner,
102116
mode => '0755',
@@ -109,6 +123,12 @@
109123
target => $docker_compose_location_versioned,
110124
require => File[$docker_compose_location_versioned],
111125
}
126+
127+
file { "${docker_plugins_path}/docker-compose":
128+
ensure => 'link',
129+
target => $docker_compose_location_versioned,
130+
require => File[$docker_plugins_path],
131+
}
112132
}
113133
} else {
114134
file { $docker_compose_location_versioned:

manifests/params.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,15 @@
9191

9292
if ($facts['os']['family'] == 'windows') {
9393
$compose_install_path = "${facts['docker_program_files_path']}/Docker"
94-
$compose_version = '1.29.2'
94+
$compose_version = '2.16.0'
9595
$docker_ee_package_name = 'Docker'
9696
$machine_install_path = "${facts['docker_program_files_path']}/Docker"
9797
$tls_cacert = "${facts['docker_program_data_path']}/docker/certs.d/ca.pem"
9898
$tls_cert = "${facts['docker_program_data_path']}/docker/certs.d/server-cert.pem"
9999
$tls_key = "${facts['docker_program_data_path']}/docker/certs.d/server-key.pem"
100100
} else {
101101
$compose_install_path = '/usr/local/bin'
102-
$compose_version = '1.29.2'
102+
$compose_version = '2.16.0'
103103
$docker_ee_package_name = 'docker-ee'
104104
$machine_install_path = '/usr/local/bin'
105105
$tls_cacert = '/etc/docker/tls/ca.pem'

0 commit comments

Comments
 (0)