diff options
| author | Nathaniel Kierpiec <nkierpiec@chef.io> | 2020-07-29 15:05:48 -0400 |
|---|---|---|
| committer | Nathaniel Kierpiec <nkierpiec@chef.io> | 2020-07-29 15:05:48 -0400 |
| commit | 05811ac9e860ac5a0bc1e94ebbfaafce8e2154da (patch) | |
| tree | c0e8d6d04b9e73eb1a8a40306a438b2e5d15befc /.expeditor | |
| parent | 8a31712502d76208c5b8fef9a09ff564301319cd (diff) | |
| download | chef-05811ac9e860ac5a0bc1e94ebbfaafce8e2154da.tar.gz | |
Introduce EXPEDITOR_VERSION for docker image tag
Chef used to use the EXPEDITOR_VERSION from the workload's metadata
when building images, reintroduce that so we can keep the same
functionality as before so that the VERSION of the repo can be bumped
but the docker images can be built off of the version being promoted.
Signed-off-by: Nathaniel Kierpiec <nkierpiec@chef.io>
Diffstat (limited to '.expeditor')
| -rw-r--r-- | .expeditor/build.docker.yml | 4 | ||||
| -rwxr-xr-x | .expeditor/update_version.sh | 3 |
2 files changed, 1 insertions, 6 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 |