From 80237aea6ac8e21a22ca23973ac6583aee681058 Mon Sep 17 00:00:00 2001 From: Nathaniel Kierpiec Date: Mon, 20 Jul 2020 16:50:14 -0400 Subject: Added dobi to the chef project Dobi will take care of building/tagging/pushing docker images. - Added dobi.yaml with specs for how to build - Added build.docker.yml file which expeditor uses to build out `docker_build.pipeline.yml` - Added .envrc for local development to be able to utilize dobi - Updated relevant files that use expeditor/dobi Signed-off-by: Nathaniel Kierpiec --- .expeditor/build.docker.yml | 3 +++ .expeditor/config.yml | 4 +--- .expeditor/update_version.sh | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 .expeditor/build.docker.yml (limited to '.expeditor') diff --git a/.expeditor/build.docker.yml b/.expeditor/build.docker.yml new file mode 100644 index 0000000000..691cf68e81 --- /dev/null +++ b/.expeditor/build.docker.yml @@ -0,0 +1,3 @@ +image_registry: chef +env: + VERSION: "16.3.18" \ No newline at end of file diff --git a/.expeditor/config.yml b/.expeditor/config.yml index fc7e78a75c..8a6f5c48d1 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -20,12 +20,10 @@ rubygems: - chef-bin - chef-utils -docker_images: - - chef - pipelines: - verify: public: true + - docker/build - habitat/build - habitat/test: definition: .expeditor/habitat-test.pipeline.yml diff --git a/.expeditor/update_version.sh b/.expeditor/update_version.sh index b362157d4b..d92c019ebb 100755 --- a/.expeditor/update_version.sh +++ b/.expeditor/update_version.sh @@ -16,6 +16,9 @@ sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"$(cat VERSION)\"/" chef-bin/li sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"$(cat VERSION)\"/" chef-utils/lib/chef-utils/version.rb sed -i -r "s/VersionString\.new\(\".+\"\)/VersionString.new(\"$(cat VERSION)\")/" lib/chef/version.rb +# Update the version for the dobi +sed -i -r "s/^(\s*)VERSION: \".+\"/\1VERSION: \"$(cat VERSION)\"/" .expeditor/build.docker.yml + # Update the version inside Gemfile.lock bundle update chef chef-config chef-utils --jobs=7 --conservative -- cgit v1.2.1