Skip to content

Commit 88812a8

Browse files
Remove unused docker-compose files and parameters
1 parent 54c185a commit 88812a8

File tree

2 files changed

+1
-45
lines changed

2 files changed

+1
-45
lines changed

spec/helper/get_defaults.rb

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
def get_defaults(_facts)
44
bip = :undef
55
bridge = :undef
6-
compose_base_url = 'https://github.com/docker/compose/releases/download'
7-
compose_symlink_name = 'docker-compose'
86
curl_ensure = true
97
default_gateway = :undef
108
default_gateway_ipv6 = :undef
@@ -88,18 +86,15 @@ def get_defaults(_facts)
8886
tmp_dir = '/tmp/'
8987
tmp_dir_config = true
9088
version = :undef
89+
compose_version = :undef
9190

9291
if _facts[:os]['family'] == 'windows'
93-
compose_install_path = "#{_facts['docker_program_files_path']}/Docker"
94-
compose_version = '1.21.2'
9592
docker_ee_package_name = 'Docker'
9693
machine_install_path = "#{_facts['docker_program_files_path']}/Docker"
9794
tls_cacert = "#{_facts['docker_program_data_path']}/docker/certs.d/ca.pem"
9895
tls_cert = "#{_facts['docker_program_data_path']}/docker/certs.d/server-cert.pem"
9996
tls_key = "#{_facts['docker_program_data_path']}/docker/certs.d/server-key.pem"
10097
else
101-
compose_install_path = '/usr/local/bin'
102-
compose_version = '1.9.0'
10398
docker_ee_package_name = 'docker-ee'
10499
machine_install_path = '/usr/local/bin'
105100
tls_cacert = '/etc/docker/tls/ca.pem'
@@ -340,9 +335,6 @@ def get_defaults(_facts)
340335
'apt_source_pin_level' => apt_source_pin_level,
341336
'bip' => bip,
342337
'bridge' => bridge,
343-
'compose_base_url' => compose_base_url,
344-
'compose_install_path' => compose_install_path,
345-
'compose_symlink_name' => compose_symlink_name,
346338
'compose_version' => compose_version,
347339
'curl_ensure' => curl_ensure,
348340
'default_gateway' => default_gateway,

spec/spec_helper_acceptance_local.rb

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -112,39 +112,6 @@ def fetch_puppet_version
112112
image: *default-image
113113
command: /bin/sh -c "while true; do echo hello world; sleep 1; done"
114114
EOS
115-
docker_compose_content_v3_windows = <<~EOS
116-
version: "3"
117-
services:
118-
compose_test:
119-
image: winamd64/hello-seattle
120-
command: cmd.exe /C "ping 8.8.8.8 -t"
121-
networks:
122-
default:
123-
external:
124-
name: nat
125-
EOS
126-
docker_compose_override_v3_windows = <<~EOS
127-
version: "3"
128-
services:
129-
compose_test:
130-
image: winamd64/hello-seattle:nanoserver
131-
command: cmd.exe /C "ping 8.8.8.8 -t"
132-
networks:
133-
default:
134-
external:
135-
name: nat
136-
EOS
137-
docker_compose_override_v3_windows2016 = <<~EOS
138-
version: "3"
139-
services:
140-
compose_test:
141-
image: winamd64/hello-seattle:nanoserver-sac2016
142-
command: cmd.exe /C "ping 8.8.8.8 -t"
143-
networks:
144-
default:
145-
external:
146-
name: nat
147-
EOS
148115
docker_stack_content_windows = <<~EOS
149116
version: "3"
150117
services:
@@ -165,13 +132,10 @@ def fetch_puppet_version
165132
image: winamd64/hello-seattle:nanoserver-sac2016
166133
EOS
167134
if os[:family] == 'windows'
168-
create_remote_file(host, '/tmp/docker-compose-v3.yml', docker_compose_content_v3_windows)
169135
create_remote_file(host, '/tmp/docker-stack.yml', docker_stack_content_windows)
170136
if %r{2019|2022}.match?(os[:release])
171-
create_remote_file(host, '/tmp/docker-compose-override-v3.yml', docker_compose_override_v3_windows)
172137
create_remote_file(host, '/tmp/docker-stack-override.yml', docker_stack_override_windows)
173138
else
174-
create_remote_file(host, '/tmp/docker-compose-override-v3.yml', docker_compose_override_v3_windows2016)
175139
create_remote_file(host, '/tmp/docker-stack-override.yml', docker_stack_override_windows2016)
176140
end
177141
else

0 commit comments

Comments
 (0)