Skip to content

Commit 19a0695

Browse files
authored
Merge branch 'main' into main
2 parents 1bed344 + c99e45e commit 19a0695

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,15 @@ All notable changes to this project will be documented in this file.
55

66
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
77

8-
## [v10.0.1](https://github.com/puppetlabs/puppetlabs-docker/tree/v10.0.1) - 2024-07-12
8+
## [v10.1.0](https://github.com/puppetlabs/puppetlabs-docker/tree/v10.1.0) - 2024-12-18
9+
10+
[Full Changelog](https://github.com/puppetlabs/puppetlabs-docker/compare/v10.0.1...v10.1.0)
11+
12+
### Added
13+
14+
- Add support for EL9 [#1007](https://github.com/puppetlabs/puppetlabs-docker/pull/1007) ([ghoneycutt](https://github.com/ghoneycutt))
15+
16+
## [v10.0.1](https://github.com/puppetlabs/puppetlabs-docker/tree/v10.0.1) - 2024-07-13
917

1018
[Full Changelog](https://github.com/puppetlabs/puppetlabs-docker/compare/v10.0.0...v10.0.1)
1119

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,20 +1011,21 @@ For information on classes, types, and functions, see the [REFERENCE.md](https:/
10111011

10121012
This module supports:
10131013

1014-
* Centos 7.0
1014+
* EL 7 - limited support available, see note below.
1015+
* EL 8
1016+
* EL 9
10151017
* Debian 8.0
10161018
* Debian 9.0
10171019
* Debian 10
10181020
* Debian 11
1019-
* RedHat 7.0 - limited support available
10201021
* Ubuntu 18.04
10211022
* Ubuntu 20.04
10221023
* Ubuntu 22.04
10231024
* Windows Server 2016 (Docker Enterprise Edition only)
10241025
* Windows Server 2019 (Docker Enterprise Edition only)
10251026
* Windows Server 2022 (Docker Enterprise Edition only)
10261027

1027-
On RedHat 7 the default docker package installs docker server version 1.13.1. The default docker.service uses the docker-storage-service in this version and creates /etc/sysconfig/docker-storage based on the container-storage-setup configuration and /etc/sysconfig/docker-storage-setup file. As the puppetlabs-docker module manages both the docker-storage and docker-storage-setup files it causes a conflict with the container-storage-setup forcing a docker service restart, therefore a workaround was included in the service manifest that disables the service restart on storage configuration changes for this version of docker on RedHat 7. As a side effect of these changes, storage configuration changes with this docker version on RedHat 7 are not picked up by default by the docker.service.
1028+
On RedHat 7 the default docker package installs docker server version 1.13.1. The default docker.service uses the docker-storage-service in this version and creates /etc/sysconfig/docker-storage based on the container-storage-setup configuration and /etc/sysconfig/docker-storage-setup file. As the puppetlabs-docker module manages both the docker-storage and docker-storage-setup files it causes a conflict with the container-storage-setup forcing a docker service restart, therefore a workaround was included in the service manifest that disables the service restart on storage configuration changes for this version of docker on RedHat 7. As a side effect of these changes, storage configuration changes with this docker version on RedHat 7 are not picked up by default by the docker.service.
10281029

10291030
## License
10301031

metadata.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "puppetlabs-docker",
3-
"version": "10.0.1",
3+
"version": "10.1.0",
44
"author": "puppetlabs",
55
"summary": "Module for installing and managing docker",
66
"license": "Apache-2.0",
@@ -30,7 +30,8 @@
3030
"operatingsystem": "CentOS",
3131
"operatingsystemrelease": [
3232
"7",
33-
"8"
33+
"8",
34+
"9"
3435
]
3536
},
3637
{

0 commit comments

Comments
 (0)