Update CHANGELOG.md to reflect the promotion of 15.17.4

Obvious fix; these changes are the result of automation not creative thinking.

2 files changed, 13 insertions, 16 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 388b1a4cb3..a6e7ce44d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,32 +2,29 @@
 
 This changelog lists individual merged pull requests to Chef Infra Client and geared towards developers. For a list of significant changes per release see the [Chef Infra Client Release Notes](https://docs.chef.io/release_notes_client/).
 
-<!-- latest_release 15.17.4 -->
-## [v15.17.4](https://github.com/chef/chef/tree/v15.17.4) (2021-04-16)
-
-#### Merged Pull Requests
-- Update the Buildkite pipeline for the macOS 11 builder naming [#11388](https://github.com/chef/chef/pull/11388) ([tas50](https://github.com/tas50))
+<!-- latest_release -->
 <!-- latest_release -->
 
-<!-- release_rollup since=15.16.7 -->
-### Changes not yet released to stable
-
-#### Merged Pull Requests
-- Update the Buildkite pipeline for the macOS 11 builder naming [#11388](https://github.com/chef/chef/pull/11388) ([tas50](https://github.com/tas50)) <!-- 15.17.4 -->
-- Pull in the patch to fix compilation of Ruby 2.6.7 [#11387](https://github.com/chef/chef/pull/11387) ([tas50](https://github.com/tas50)) <!-- 15.17.3 -->
-- Update InSpec to 4.32 [#11385](https://github.com/chef/chef/pull/11385) ([tas50](https://github.com/tas50)) <!-- 15.17.2 -->
-- Trigger a new build of 15.x [#11344](https://github.com/chef/chef/pull/11344) ([tas50](https://github.com/tas50)) <!-- 15.17.1 -->
-- Update to Ruby 2.6.7 and InSpec 4.31.1 [#11343](https://github.com/chef/chef/pull/11343) ([tas50](https://github.com/tas50)) <!-- 15.17.0 -->
+<!-- release_rollup -->
 <!-- release_rollup -->
 
 <!-- latest_stable_release -->
+## [v15.17.4](https://github.com/chef/chef/tree/v15.17.4) (2021-04-17)
+
+#### Merged Pull Requests
+- Update to Ruby 2.6.7 and InSpec 4.31.1 [#11343](https://github.com/chef/chef/pull/11343) ([tas50](https://github.com/tas50))
+- Trigger a new build of 15.x [#11344](https://github.com/chef/chef/pull/11344) ([tas50](https://github.com/tas50))
+- Update InSpec to 4.32 [#11385](https://github.com/chef/chef/pull/11385) ([tas50](https://github.com/tas50))
+- Pull in the patch to fix compilation of Ruby 2.6.7 [#11387](https://github.com/chef/chef/pull/11387) ([tas50](https://github.com/tas50))
+- Update the Buildkite pipeline for the macOS 11 builder naming [#11388](https://github.com/chef/chef/pull/11388) ([tas50](https://github.com/tas50))
+<!-- latest_stable_release -->
+
 ## [v15.16.7](https://github.com/chef/chef/tree/v15.16.7) (2021-04-02)
 
 #### Merged Pull Requests
 - Update readme [#11254](https://github.com/chef/chef/pull/11254) ([tas50](https://github.com/tas50))
 - Bump omnibus-software from `caf6ae0` to `a0e7438` in /omnibus [#11269](https://github.com/chef/chef/pull/11269) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot]))
 - Fix hab package builds [#11288](https://github.com/chef/chef/pull/11288) ([tas50](https://github.com/tas50))
-<!-- latest_stable_release -->
 
 ## [v15.16.4](https://github.com/chef/chef/tree/v15.16.4) (2021-03-27)
 
diff --git a/Dockerfile b/Dockerfile
index cab0c2036e..8dddc238d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ FROM busybox
 LABEL maintainer="Chef Software, Inc. <docker@chef.io>"
 
 ARG CHANNEL=stable
-ARG VERSION=15.16.7
+ARG VERSION=15.17.4
 
 RUN wget "http://packages.chef.io/files/${CHANNEL}/chef/${VERSION}/el/6/chef-${VERSION}-1.el6.x86_64.rpm" -O /tmp/chef-client.rpm && \
     rpm2cpio /tmp/chef-client.rpm | cpio -idmv && \