diff options
author | Tim Smith <tsmith@chef.io> | 2020-07-29 12:27:51 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-29 12:27:51 -0700 |
commit | 4acf71f4ccb8d09affe3b8779498617ddd0b524d (patch) | |
tree | c0e8d6d04b9e73eb1a8a40306a438b2e5d15befc | |
parent | 8a31712502d76208c5b8fef9a09ff564301319cd (diff) | |
parent | 05811ac9e860ac5a0bc1e94ebbfaafce8e2154da (diff) | |
download | chef-4acf71f4ccb8d09affe3b8779498617ddd0b524d.tar.gz |
Merge pull request #10231 from chef/nkierpiec/dobi-version-updates
Introduce EXPEDITOR_VERSION for docker image tag
-rw-r--r-- | .expeditor/build.docker.yml | 4 | ||||
-rwxr-xr-x | .expeditor/update_version.sh | 3 | ||||
-rw-r--r-- | dobi.yaml | 4 |
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 @@ -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: |