Merge branch 'main' into im/eol-hosted-chef

chef · Jan 9, 2025 · ae3130d · ae3130d
2 parents 8accdd5 + 0bcc26e
commit ae3130d
Show file tree

Hide file tree

Showing 6 changed files with 182 additions and 180 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,27 +1,26 @@
 <!-- usage documentation: https://expeditor.chef.io/docs/reference/changelog/ -->
-<!-- latest_release 24.10.1071 -->
-## [24.10.1071](https://github.com/chef/chef-workstation/tree/24.10.1071) (2024-10-23)
-
-#### Merged Pull Requests
-- Vendor dir removed and Go version updated [#3279](https://github.com/chef/chef-workstation/pull/3279) ([sanghinitin](https://github.com/sanghinitin))
+<!-- latest_release -->
 <!-- latest_release -->
 
-<!-- release_rollup since=24.8.1068 -->
-### Changes not yet released to stable
-
-#### Merged Pull Requests
-- Vendor dir removed and Go version updated [#3279](https://github.com/chef/chef-workstation/pull/3279) ([sanghinitin](https://github.com/sanghinitin)) <!-- 24.10.1071 -->
-- Update knife_ssh.md [#3271](https://github.com/chef/chef-workstation/pull/3271) ([IanMadd](https://github.com/IanMadd)) <!-- 24.10.1070 -->
-- Remove references to packages.chef.io [#3281](https://github.com/chef/chef-workstation/pull/3281) ([dishanktiwari2501](https://github.com/dishanktiwari2501)) <!-- 24.10.1069 -->
+<!-- release_rollup -->
 <!-- release_rollup -->
 
 <!-- latest_stable_release -->
+## [24.12.1073](https://github.com/chef/chef-workstation/tree/24.12.1073) (2024-12-18)
+
+#### Merged Pull Requests
+- Remove references to packages.chef.io [#3281](https://github.com/chef/chef-workstation/pull/3281) ([dishanktiwari2501](https://github.com/dishanktiwari2501))
+- Update knife_ssh.md [#3271](https://github.com/chef/chef-workstation/pull/3271) ([IanMadd](https://github.com/IanMadd))
+- Vendor dir removed and Go version updated [#3279](https://github.com/chef/chef-workstation/pull/3279) ([sanghinitin](https://github.com/sanghinitin))
+- Correct download APIs [#3287](https://github.com/chef/chef-workstation/pull/3287) ([IanMadd](https://github.com/IanMadd))
+- CHEF-15132-Workstation release 24.12 [#3288](https://github.com/chef/chef-workstation/pull/3288) ([nikhil2611](https://github.com/nikhil2611))
+<!-- latest_stable_release -->
+
 ## [24.8.1068](https://github.com/chef/chef-workstation/tree/24.8.1068) (2024-08-12)
 
 #### Merged Pull Requests
 - Bump kitchen-dokken to 2.20.6 [#3250](https://github.com/chef/chef-workstation/pull/3250) ([KawaiDesu](https://github.com/KawaiDesu))
 - updated doc with the current updated versions [#3267](https://github.com/chef/chef-workstation/pull/3267) ([nikhil2611](https://github.com/nikhil2611))
-<!-- latest_stable_release -->
 
 ## [24.6.1066](https://github.com/chef/chef-workstation/tree/24.6.1066) (2024-06-10)
 

diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:22.04
 LABEL maintainer="Chef Software, Inc. <[email protected]>"
 
 ARG CHANNEL=stable
-ARG VERSION=24.8.1068
+ARG VERSION=24.12.1073
 ENV DEBIAN_FRONTEND=noninteractive \
     GEM_HOME=/root/.chefdk/gem/ruby/3.0.0 \
     PATH=/opt/chef-workstation/bin:/opt/chef-workstation/embedded/bin:/root/.chefdk/gem/ruby/3.0.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-24.10.1071
+24.12.1073