summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2021-01-09 01:03:19 +0000
committerChef Expeditor <chef-ci@chef.io>2021-01-09 01:03:19 +0000
commit8284d9c32850e55bc8138f9d74af5e2f94cc8d7d (patch)
treeec7e4d4f72cee018ad50f1f40d93cf2bb0340c0e
parenta7d3829cf0b277c2eff8df820221b2f4a25b259d (diff)
downloadchef-8284d9c32850e55bc8138f9d74af5e2f94cc8d7d.tar.gz
Update CHANGELOG.md to reflect the promotion of 16.9.17
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md10
-rw-r--r--Dockerfile2
2 files changed, 8 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1685cde947..0a73023245 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,15 +9,20 @@ This changelog lists individual merged pull requests to Chef Infra Client and ge
- Update chef-zero to 15.0.4 to resolve missing dep failures [#10857](https://github.com/chef/chef/pull/10857) ([tas50](https://github.com/tas50))
<!-- latest_release -->
-<!-- release_rollup since=16.9.16 -->
+<!-- release_rollup since=16.9.17 -->
### Changes not yet released to stable
#### Merged Pull Requests
- Update chef-zero to 15.0.4 to resolve missing dep failures [#10857](https://github.com/chef/chef/pull/10857) ([tas50](https://github.com/tas50)) <!-- 16.9.18 -->
-- Make sure our containers work on RHEL 6 [#10856](https://github.com/chef/chef/pull/10856) ([tas50](https://github.com/tas50)) <!-- 16.9.17 -->
<!-- release_rollup -->
<!-- latest_stable_release -->
+## [v16.9.17](https://github.com/chef/chef/tree/v16.9.17) (2021-01-09)
+
+#### Merged Pull Requests
+- Make sure our containers work on RHEL 6 [#10856](https://github.com/chef/chef/pull/10856) ([tas50](https://github.com/tas50))
+<!-- latest_stable_release -->
+
## [v16.9.16](https://github.com/chef/chef/tree/v16.9.16) (2021-01-05)
#### Merged Pull Requests
@@ -44,7 +49,6 @@ This changelog lists individual merged pull requests to Chef Infra Client and ge
- Update Ohai to 16.8.2 and pin chefstyle [#10824](https://github.com/chef/chef/pull/10824) ([tas50](https://github.com/tas50))
- Update Nokogiri to 1.11.0 [#10828](https://github.com/chef/chef/pull/10828) ([tas50](https://github.com/tas50))
- Add a new `reposdir` property in the `yum_repository` resource [#10831](https://github.com/chef/chef/pull/10831) ([tas50](https://github.com/tas50))
-<!-- latest_stable_release -->
## [v16.8.14](https://github.com/chef/chef/tree/v16.8.14) (2020-12-12)
diff --git a/Dockerfile b/Dockerfile
index 248788bba5..aa4bc3a62e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ FROM busybox
LABEL maintainer="Chef Software, Inc. <docker@chef.io>"
ARG CHANNEL=stable
-ARG VERSION=16.9.16
+ARG VERSION=16.9.17
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 && \