File tree 2 files changed +23
-3
lines changed
2 files changed +23
-3
lines changed Original file line number Diff line number Diff line change 56
56
57
57
$docker_compose_location = " ${install_path} /${symlink_name}${file_extension} "
58
58
$docker_compose_location_versioned = " ${install_path} /docker-compose-${version}${file_extension} "
59
+ $docker_plugins_path = ' /usr/local/lib/docker/cli-plugins'
59
60
60
61
if $ensure == ' present' {
61
62
if $raw_url != undef {
62
63
$docker_compose_url = $raw_url
63
64
} 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} "
65
70
}
66
71
67
72
if $proxy != undef {
97
102
require => Package[' curl' ],
98
103
}
99
104
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
+
100
114
file { $docker_compose_location_versioned:
101
115
owner => $file_owner ,
102
116
mode => ' 0755' ,
109
123
target => $docker_compose_location_versioned ,
110
124
require => File [$docker_compose_location_versioned ],
111
125
}
126
+
127
+ file { "${docker_plugins_path}/docker-compose" :
128
+ ensure => ' link' ,
129
+ target => $docker_compose_location_versioned ,
130
+ require => File [$docker_plugins_path ],
131
+ }
112
132
}
113
133
} else {
114
134
file { $docker_compose_location_versioned:
Original file line number Diff line number Diff line change 91
91
92
92
if ($facts [' os' ][' family' ] == ' windows' ) {
93
93
$compose_install_path = " ${facts['docker_program_files_path']}/Docker"
94
- $compose_version = ' 1.29.2 '
94
+ $compose_version = ' 2.16.0 '
95
95
$docker_ee_package_name = ' Docker'
96
96
$machine_install_path = " ${facts['docker_program_files_path']}/Docker"
97
97
$tls_cacert = " ${facts['docker_program_data_path']}/docker/certs.d/ca.pem"
98
98
$tls_cert = " ${facts['docker_program_data_path']}/docker/certs.d/server-cert.pem"
99
99
$tls_key = " ${facts['docker_program_data_path']}/docker/certs.d/server-key.pem"
100
100
} else {
101
101
$compose_install_path = ' /usr/local/bin'
102
- $compose_version = ' 1.29.2 '
102
+ $compose_version = ' 2.16.0 '
103
103
$docker_ee_package_name = ' docker-ee'
104
104
$machine_install_path = ' /usr/local/bin'
105
105
$tls_cacert = ' /etc/docker/tls/ca.pem'
You can’t perform that action at this time.
0 commit comments