From cab1bcb96eb671068b41423bb68c35abfdfb551f Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Thu, 18 Apr 2024 12:50:33 +0200 Subject: [PATCH] Include changelog in docsite (#837) * Include changelog in docsite. * Fix changelog. --- CHANGELOG.md | 2 +- CHANGELOG.rst | 2 +- changelogs/changelog.yaml | 2 +- docs/docsite/config.yml | 3 +++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e232e76..14112954 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -987,7 +987,7 @@ New major release with some deprecations removed and a breaking change in the ### Breaking Changes / Porting Guide -* docker\_compose \- fixed timeout defaulting behavior so that stop\_grace\_period\, if defined in the compose file\, will be used if timeout\` is not specified \([https\://github\.com/ansible\-collections/community\.docker/pull/163](https\://github\.com/ansible\-collections/community\.docker/pull/163)\)\. +* docker\_compose \- fixed timeout defaulting behavior so that stop\_grace\_period\, if defined in the compose file\, will be used if timeout is not specified \([https\://github\.com/ansible\-collections/community\.docker/pull/163](https\://github\.com/ansible\-collections/community\.docker/pull/163)\)\. ### Deprecated Features diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 74e43714..9eab5432 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -768,7 +768,7 @@ New major release with some deprecations removed and a breaking change in the `` Breaking Changes / Porting Guide -------------------------------- -- docker_compose - fixed ``timeout`` defaulting behavior so that ``stop_grace_period``, if defined in the compose file, will be used if `timeout`` is not specified (https://github.com/ansible-collections/community.docker/pull/163). +- docker_compose - fixed ``timeout`` defaulting behavior so that ``stop_grace_period``, if defined in the compose file, will be used if ``timeout`` is not specified (https://github.com/ansible-collections/community.docker/pull/163). Deprecated Features ------------------- diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index db03d248..6ac5cdf1 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -436,7 +436,7 @@ releases: changes: breaking_changes: - docker_compose - fixed ``timeout`` defaulting behavior so that ``stop_grace_period``, - if defined in the compose file, will be used if `timeout`` is not specified + if defined in the compose file, will be used if ``timeout`` is not specified (https://github.com/ansible-collections/community.docker/pull/163). deprecated_features: - docker_container - using the special value ``all`` in ``published_ports`` diff --git a/docs/docsite/config.yml b/docs/docsite/config.yml index 846b95f6..48eedc26 100644 --- a/docs/docsite/config.yml +++ b/docs/docsite/config.yml @@ -13,3 +13,6 @@ envvar_directives: - DOCKER_TLS - DOCKER_TLS_HOSTNAME - DOCKER_TLS_VERIFY + +changelog: + write_changelog: true