Skip to content

Commit 248e21c

Browse files
authored
Merge pull request
sha_of_the_head_commit
2 parents fc06928 + af4f58d commit 248e21c

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

README.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@
2525
* [Plugins](#plugins)
2626
4. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
2727
5. [Limitations - OS compatibility, etc.](#limitations)
28-
6. [Development - Guide for contributing to the module](#development)
29-
7. [Acceptance](#acceptance)
28+
6. [License](#license)
29+
7. [Development - Guide for contributing to the module](#development)
30+
8. [Acceptance](#acceptance)
3031

3132

3233
## Description
@@ -1025,6 +1026,10 @@ This module supports:
10251026

10261027
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.
10271028

1029+
## License
1030+
1031+
This codebase is licensed under the Apache2.0 licensing, however due to the nature of the codebase the open source dependencies may also use a combination of [AGPL](https://opensource.org/license/agpl-v3/), [BSD-2](https://opensource.org/license/bsd-2-clause/), [BSD-3](https://opensource.org/license/bsd-3-clause/), [GPL2.0](https://opensource.org/license/gpl-2-0/), [LGPL](https://opensource.org/license/lgpl-3-0/), [MIT](https://opensource.org/license/mit/) and [MPL](https://opensource.org/license/mpl-2-0/) Licensing.
1032+
10281033
## Development
10291034

10301035
If you would like to contribute to this module, see the guidelines in [CONTRIBUTING.MD](https://github.com/puppetlabs/puppetlabs-docker/blob/main/CONTRIBUTING.md).

0 commit comments

Comments
 (0)