From ff0b4ac60bdc61392c4b543c3be8ae97dc8cd191 Mon Sep 17 00:00:00 2001
From: Milas Bowman <milas.bowman@docker.com>
Date: Thu, 11 Aug 2022 17:20:13 -0400
Subject: [PATCH] docs: add changelog for 6.0.0 (#3019)

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
---
 docs/change-log.md | 40 +++++++++++++++++++++++++++++++++++++++-
 tests/Dockerfile   |  2 +-
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/docs/change-log.md b/docs/change-log.md
index 91f3fe6f1..5927728b1 100644
--- a/docs/change-log.md
+++ b/docs/change-log.md
@@ -1,6 +1,44 @@
-Change log
+Changelog
 ==========
 
+6.0.0
+-----
+
+### Upgrade Notes
+- Minimum supported Python version is 3.7+
+- When installing with pip, the `docker[tls]` extra is deprecated and a no-op,
+  use `docker` for same functionality (TLS support is always available now)
+- Native Python SSH client (used by default / `use_ssh_client=False`) will now
+  reject unknown host keys with `paramiko.ssh_exception.SSHException`
+- Short IDs are now 12 characters instead of 10 characters (same as Docker CLI)
+
+### Features
+- Python 3.10 support
+- Automatically negotiate most secure TLS version
+- Add `platform` (e.g. `linux/amd64`, `darwin/arm64`) to container create & run
+- Add support for `GlobalJob` and `ReplicatedJobs` for Swarm
+- Add `remove()` method on `Image`
+- Add `force` param to `disable()` on `Plugin`
+
+### Bugfixes
+- Fix install issues on Windows related to `pywin32`
+- Do not accept unknown SSH host keys in native Python SSH mode
+- Use 12 character short IDs for consistency with Docker CLI
+- Ignore trailing whitespace in `.dockerignore` files
+- Fix IPv6 host parsing when explicit port specified
+- Fix `ProxyCommand` option for SSH connections
+- Do not spawn extra subshell when launching external SSH client
+- Improve exception semantics to preserve context
+- Documentation improvements (formatting, examples, typos, missing params)
+
+### Miscellaneous
+- Upgrade dependencies in `requirements.txt` to latest versions
+- Remove extraneous transitive dependencies
+- Eliminate usages of deprecated functions/methods
+- Test suite reliability improvements
+- GitHub Actions workflows for linting, unit tests, integration tests, and
+  publishing releases
+
 5.0.3
 -----
 
diff --git a/tests/Dockerfile b/tests/Dockerfile
index cf2cd67df..2cac785d9 100644
--- a/tests/Dockerfile
+++ b/tests/Dockerfile
@@ -39,6 +39,6 @@ RUN --mount=type=cache,target=/root/.cache/pip \
     pip install -r test-requirements.txt
 
 COPY . /src
-ARG SETUPTOOLS_SCM_PRETEND_VERSION=99.0.0-docker
+ARG SETUPTOOLS_SCM_PRETEND_VERSION=99.0.0+docker
 RUN --mount=type=cache,target=/root/.cache/pip \
     pip install -e .