Merge pull request #10231 from chef/nkierpiec/dobi-version-updates

Introduce EXPEDITOR_VERSION for docker image tag

3 files changed, 3 insertions, 8 deletions

diff --git a/.expeditor/build.docker.yml b/.expeditor/build.docker.yml
index 8ec2df8dc2..fed7a9cfaa 100644
--- a/.expeditor/build.docker.yml
+++ b/.expeditor/build.docker.yml
@@ -1,3 +1 @@
-image_registry: chef
-env:
-  VERSION: "16.3.46"
\ No newline at end of file
+image_registry: chef
\ No newline at end of file
diff --git a/.expeditor/update_version.sh b/.expeditor/update_version.sh
index 3312cccbc0..2a75c4b2f9 100755
--- a/.expeditor/update_version.sh
+++ b/.expeditor/update_version.sh
@@ -18,9 +18,6 @@ sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"${VERSION}\"/" chef-bin/lib/ch
 sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"${VERSION}\"/" chef-utils/lib/chef-utils/version.rb
 sed -i -r "s/VersionString\.new\(\".+\"\)/VersionString.new(\"${VERSION}\")/" lib/chef/version.rb
 
-# Update the version for the dobi
-sed -i -r "s/^(\s*)VERSION: \".+\"/\1VERSION: \"${VERSION}\"/" .expeditor/build.docker.yml
-
 # Update the version inside Gemfile.lock
 bundle update chef chef-config chef-utils --jobs=7 --conservative
 
diff --git a/dobi.yaml b/dobi.yaml
index 4de875ce34..b038f8c411 100644
--- a/dobi.yaml
+++ b/dobi.yaml
@@ -12,9 +12,9 @@ image=chef:
   image: '{env.IMAGE_REGISTRY}/chef'
   context: .
   tags:
-    - '{env.VERSION}'
+    - '{env.EXPEDITOR_VERSION}'
   args:
-    VERSION: '{env.VERSION}'
+    VERSION: '{env.EXPEDITOR_VERSION}'
     CHANNEL: unstable
   annotations:
     tags: