Skip to content

[WIP] Add Archlinux compatibility #178

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

Closed
wants to merge 2 commits into from
Closed
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ This module installs, configures, and manages [Docker](https://github.com/docker
* Ubuntu 14.04
* Ubuntu 16.04
* Centos 7.0
* Archlinux

## Usage

Expand Down Expand Up @@ -102,7 +103,7 @@ To use the CE packages
```puppet
class { 'docker':
use_upstream_package_source => false,
repo_opt => '',
repo_opt => '',
}
```

Expand Down Expand Up @@ -450,7 +451,6 @@ To install Docker Compose, add the following code to the manifest file:
class {'docker::compose':
ensure => present,
version => '1.9.0',

}
```
The param `version` can be set to any version that you need to install.
Expand Down
14 changes: 11 additions & 3 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,9 @@
# Sets the prefered container registry mirror.
# Default: undef
#
# [*manage_repo*]
# allows you to control the repo management. Default depends on the platform
#
class docker(
Optional[String] $version = $docker::params::version,
String $ensure = $docker::params::ensure,
Expand Down Expand Up @@ -460,11 +463,12 @@
Optional[Boolean] $service_hasstatus = $docker::params::service_hasstatus,
Optional[Boolean] $service_hasrestart = $docker::params::service_hasrestart,
Optional[String] $registry_mirror = $docker::params::registry_mirror,
Boolean $manage_repo = $docker::params::manage_repo,
) inherits docker::params {


if $::osfamily {
assert_type(Pattern[/^(Debian|RedHat)$/], $::osfamily) |$a, $b| {
assert_type(Pattern[/^(Debian|RedHat|Archlinux)$/], $::osfamily) |$a, $b| {
fail translate(('This module only works on Debian or Red Hat based systems.'))
}
}
Expand Down Expand Up @@ -576,12 +580,16 @@
$docker_package_name = $docker_engine_package_name
}

contain 'docker::repos'
if $manage_repo {
contain 'docker::repos'
Class['docker::repos'] -> Class['docker::install'] -> Class['docker::config'] ~> Class['docker::service']
} else {
Class['docker::install'] -> Class['docker::config'] ~> Class['docker::service']
}
contain 'docker::install'
contain 'docker::config'
contain 'docker::service'

Class['docker::repos'] -> Class['docker::install'] -> Class['docker::config'] ~> Class['docker::service']
Class['docker'] -> Docker::Registry <||> -> Docker::Image <||> -> Docker::Run <||>
Class['docker'] -> Docker::Image <||> -> Docker::Run <||>
Class['docker'] -> Docker::Run <||>
Expand Down
2 changes: 1 addition & 1 deletion manifests/install.pp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class docker::install {
$docker_start_command = $docker::docker_start_command
if $::osfamily {
assert_type(Pattern[/^(Debian|RedHat)$/], $::osfamily) |$a, $b| {
assert_type(Pattern[/^(Debian|RedHat|Archlinux)$/], $::osfamily) |$a, $b| {
fail translate(('This module only works on Debian or RedHat.'))
}
}
Expand Down
42 changes: 41 additions & 1 deletion manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
$version = undef
$ensure = present
$docker_ce_start_command = 'dockerd'
$docker_ce_package_name = 'docker-ce'
$docker_engine_start_command = 'docker daemon'
$docker_engine_package_name = 'docker-engine'
$docker_ce_channel = stable
Expand Down Expand Up @@ -99,6 +98,7 @@
$service_overrides_template = 'docker/etc/systemd/system/docker.service.d/service-overrides-debian.conf.erb'
$service_hasstatus = true
$service_hasrestart = true
$manage_repo = true
include docker::systemd_reload
} else {
$service_config_template = 'docker/etc/default/docker.erb'
Expand All @@ -107,6 +107,7 @@
$service_hasstatus = true
$service_hasrestart = false
$storage_config = undef
$manage_repo = true
}
}
default: {
Expand All @@ -117,6 +118,7 @@
$service_overrides_template = 'docker/etc/systemd/system/docker.service.d/service-overrides-debian.conf.erb'
$service_hasstatus = true
$service_hasrestart = true
$manage_repo = true
include docker::systemd_reload
}
}
Expand All @@ -135,6 +137,7 @@
$package_ce_key_source = "https://download.docker.com/linux/${os_lc}/gpg"
$package_ce_key_id = '9DC858229FC7DD38854AE2D88D81803C0EBFCD88'
$package_ce_release = $::lsbdistcodename
$docker_ce_package_name = 'docker-ce'
$package_source_location = 'http://apt.dockerproject.org/repo'
$package_key_source = 'https://apt.dockerproject.org/gpg'
$package_key_check_source = undef
Expand Down Expand Up @@ -167,6 +170,7 @@
$service_overrides_template = 'docker/etc/systemd/system/docker.service.d/service-overrides-rhel.conf.erb'
$use_upstream_package_source = true

$docker_ce_package_name = 'docker-ce'
$package_ce_source_location = "https://download.docker.com/linux/centos/${::operatingsystemmajrelease}/${::architecture}/${docker_ce_channel}"
$package_ce_key_source = 'https://download.docker.com/linux/centos/gpg'
$package_ce_key_id = undef
Expand Down Expand Up @@ -204,6 +208,41 @@
$repo_opt = undef
}
}
'Archlinux': {
$docker_ce_package_name = 'docker'
$service_config = undef
$storage_setup_file = undef
$repo_opt = undef
$docker_group = 'docker'
$service_name = 'docker'
$socket_group = 'docker'
$apt_source_pin_level = undef
$pin_upstream_package_source = undef
$use_upstream_package_source = undef
$package_ee_release = undef
$package_ee_repos = undef
$package_ee_key_id = undef
$package_ee_key_source = undef
$package_ee_source_location = undef
$package_ee_package_name = undef
$package_release = undef
$package_key_id = undef
$package_key_check_source = undef
$package_key_source = undef
$package_source_location = undef
$package_ce_release = undef
$package_ce_key_id = undef
$package_ce_key_source = undef
$package_ce_source_location = undef
$service_provider = 'systemd'
$storage_config = '/etc/default/docker-storage'
$service_config_template = 'docker/etc/sysconfig/docker.systemd.erb'
$service_overrides_template = 'docker/etc/systemd/system/docker.service.d/service-overrides-debian.conf.erb'
$service_hasstatus = true
$service_hasrestart = true
$manage_repo = false
include docker::systemd_reload
}
default: {
$docker_group = $docker_group_default
$socket_group = $socket_group_default
Expand Down Expand Up @@ -240,6 +279,7 @@
$service_config_template = undef
$pin_upstream_package_source = undef
$apt_source_pin_level = undef
$manage_repo = false
}
}

Expand Down
4 changes: 3 additions & 1 deletion manifests/service.pp
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
$registry_mirror = $docker::registry_mirror,
) {

unless $::osfamily =~ /(Debian|RedHat)/ {
unless $::osfamily =~ /(Debian|RedHat|Archlinux)/ {
fail translate(('The docker::service class needs a Debian or Redhat based system.'))
}

Expand All @@ -130,6 +130,8 @@
} else {
if $::osfamily == 'Debian' {
$_service_config = "/etc/default/${service_name}"
} else {
$_service_config = $service_config
}
}

Expand Down
3 changes: 3 additions & 0 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
"8.0",
"9.0"
]
},
{
"operatingsystem": "Archlinux"
}
],
"requirements": [
Expand Down