Skip to content

Commit 7e8dc53

Browse files
committed
remove code for EOL and unsupported Debian 7 wheezy
1 parent 6bb456f commit 7e8dc53

File tree

3 files changed

+2
-24
lines changed

3 files changed

+2
-24
lines changed

README.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,6 @@ class { 'docker':
6262
}
6363
```
6464

65-
Using a version prior to 17.06, configures and installs from the old repositories:
66-
67-
```puppet
68-
class { 'docker':
69-
version => '1.12.0-0~wheezy',
70-
}
71-
```
72-
7365
Docker provides a enterprise addition of the [Docker Engine](https://www.docker.com/enterprise-edition), called Docker EE. To install Docker EE on Debian systems, add the following code to the manifest file:
7466

7567
```puppet

manifests/repos.pp

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,12 @@
5151

5252
if $docker::manage_package {
5353
include apt
54-
55-
if (versioncmp($facts['facterversion'], '2.4.6') <= 0) {
56-
if $facts['os']['name'] == 'Debian' and $facts['os']['lsb']['distcodename'] == 'wheezy' {
57-
include apt::backports
58-
}
59-
} else {
60-
if $facts['os']['name'] == 'Debian' and $facts['os']['distro']['codename'] == 'wheezy' {
61-
include apt::backports
62-
}
63-
}
6454
Exec['apt_update'] -> Package[$docker::prerequired_packages]
6555
Apt::Source['docker'] -> Package['docker']
6656
}
6757
}
6858
}
59+
6960
'RedHat': {
7061
if ($docker::manage_package) {
7162
$baseurl = $location
@@ -84,6 +75,7 @@
8475
}
8576
}
8677
}
78+
8779
default: {}
8880
}
8981
}

spec/shared_examples/repos.rb

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,6 @@
6565
expect(subject).to contain_class('apt')
6666
}
6767

68-
if facts[:os]['name'] == 'Debian' && facts[:os]['distro']['codename'] == 'wheezy'
69-
it {
70-
expect(subject).to contain_class('apt::backports')
71-
}
72-
end
73-
7468
it {
7569
params['prerequired_packages'].each do |package|
7670
expect(subject).to contain_exec('apt_update').that_comes_before("package[#{package}]")

0 commit comments

Comments
 (0)