Merge pull request #5632 from chef/tduffield/use-dokken-in-announcements

Update Release Announcements; Keep Dockerfile up-to-date

5 files changed, 13 insertions, 19 deletions

diff --git a/README.md b/README.md
index 4a12267dca..06d695a138 100644
--- a/README.md
+++ b/README.md
@@ -20,13 +20,14 @@ If you just want to use Chef, check out these resources:
 
 * [learnchef](https://learn.chef.io): Getting started guide
 * [docs.chef.io](https://docs.chef.io): Comprehensive User Docs
-* [Installer Downloads](https://downloads.chef.io/chef-client/): Install Chef as a complete package
+* [Installer Downloads](https://downloads.chef.io/chef/): Install Chef as a complete package
+* [chef/chef](https://hub.docker.com/r/chef/chef): Docker image for use with [kitchen-dokken](https://github.com/someara/kitchen-dokken)
 
 ## Installing From Git
 
 **NOTE:** Unless you have a specific reason to install from source (to
 try a new feature, contribute a patch, or run chef on an OS for which no
-package is available), you should head to the [downloads page](https://downloads.chef.io/chef-client/)
+package is available), you should head to the [downloads page](https://downloads.chef.io/chef/)
 to get a prebuilt package.
 
 ### Prerequisites
diff --git a/Rakefile b/Rakefile
index a72da319c9..311639230b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -68,6 +68,15 @@ task :register_eventlog do
   end
 end
 
+desc "Keep the Dockerfile up-to-date"
+task :update_dockerfile do
+  require "mixlib/install"
+  latest_stable_version = Mixlib::Install.available_versions("chef", "stable").last
+  text = File.read("Dockerfile")
+  new_text = text.gsub(/^ARG VERSION=[\d\.]+$/, "ARG VERSION=#{latest_stable_version}")
+  File.open("Dockerfile", "w+") { |f| f.write(new_text) }
+end
+
 begin
   require "chefstyle"
   require "rubocop/rake_task"
diff --git a/ci/version_bump.sh b/ci/version_bump.sh
index f3c345b7f0..5fa6fa4e98 100755
--- a/ci/version_bump.sh
+++ b/ci/version_bump.sh
@@ -8,5 +8,6 @@ export LANG=en_US.UTF-8
 
 bundle exec rake version:bump
 bundle exec rake changelog
+bundle exec rake update_dockerfile
 
 git checkout .bundle/config
diff --git a/tasks/templates/prerelease.md.erb b/tasks/templates/prerelease.md.erb
index 82646e7485..0c5c55cffc 100644
--- a/tasks/templates/prerelease.md.erb
+++ b/tasks/templates/prerelease.md.erb
@@ -24,12 +24,3 @@ $ curl https://omnitruck.chef.io/install.sh | sudo bash -s -- -P chef -v <%= @ve
 # In Windows Powershell
 . { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; install -project chef -version <%= @version %> -channel current
 ```
-
-If you want to give this version a spin in Test Kitchen, create or add the following to a `.kitchen.local.yml` file:
-
-```yaml
-provisioner:
-  product_name: chef
-  channel: current
-  product_version: <%= @version %>
-```
diff --git a/tasks/templates/release.md.erb b/tasks/templates/release.md.erb
index 080e77000a..2c6ff0b7c6 100644
--- a/tasks/templates/release.md.erb
+++ b/tasks/templates/release.md.erb
@@ -24,11 +24,3 @@ $ curl https://omnitruck.chef.io/install.sh | sudo bash -s -- -P chef -v <%= @ve
 # In Windows Powershell
 . { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; install -project chef -version <%= @version %>
 ```
-
-If you want to give this version a spin in Test Kitchen, create or add the following to a `.kitchen.local.yml` file:
-
-```yaml
-provisioner:
-  product_name: chef
-  product_version: <%= @version %>
-```