Skip to content

Remove code for EOL and unsupported Debian 7 wheezy #1020

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,6 @@ class { 'docker':
}
```

Using a version prior to 17.06, configures and installs from the old repositories:

```puppet
class { 'docker':
version => '1.12.0-0~wheezy',
}
```

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:

```puppet
Expand Down
12 changes: 2 additions & 10 deletions manifests/repos.pp
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,12 @@

if $docker::manage_package {
include apt

if (versioncmp($facts['facterversion'], '2.4.6') <= 0) {
if $facts['os']['name'] == 'Debian' and $facts['os']['lsb']['distcodename'] == 'wheezy' {
include apt::backports
}
} else {
if $facts['os']['name'] == 'Debian' and $facts['os']['distro']['codename'] == 'wheezy' {
include apt::backports
}
}
Exec['apt_update'] -> Package[$docker::prerequired_packages]
Apt::Source['docker'] -> Package['docker']
}
}
}

'RedHat': {
if ($docker::manage_package) {
$baseurl = $location
Expand All @@ -85,6 +76,7 @@
}
}
}

default: {}
}
}
6 changes: 0 additions & 6 deletions spec/shared_examples/repos.rb
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,6 @@
expect(subject).to contain_class('apt')
}

if facts[:os]['name'] == 'Debian' && facts[:os]['distro']['codename'] == 'wheezy'
it {
expect(subject).to contain_class('apt::backports')
}
end

it {
params['prerequired_packages'].each do |package|
expect(subject).to contain_exec('apt_update').that_comes_before("package[#{package}]")
Expand Down
Loading