Add further clarifications to usage of docker/build pipeline

* Add the new `built_in:promote_docker_images` action
* Replace `built_in:build_docker_image` with `trigger_pipeline:docker/build`
* Remove unnecessary logic from Dockerfile
* Add inline comment context for dobi.yaml

Signed-off-by: Tom Duffield <tom@chef.io>

1 files changed, 13 insertions, 3 deletions

diff --git a/dobi.yaml b/dobi.yaml
index bd831c3746..a113a1a4ab 100644
--- a/dobi.yaml
+++ b/dobi.yaml
@@ -1,8 +1,18 @@
-
-# Images
+# Chef Expeditor uses this file to build the chef/chef Docker image using Dobi (dnephin/dobi)
+#
+# If you wish to build the chef-infra-client Docker image, you do not need to use this file.
+# You can build the Docker image for yourself by simply running:
+#
+#   docker build .
+#
+# For more information on how this file is used, please check out the Chef Expeditor docs:
+#   https://expeditor.chef.io/docs/pipelines/docker/
 
 image=chef:
   image: '{env.IMAGE_REGISTRY}/chef'
   context: .
   tags:
-    - '{env.VERSION}'
\ No newline at end of file
+    - '{env.VERSION}'
+  annotations:
+    tags:
+      - expeditor:final-channel-tags={{major}},{{major}}.{{minor}}
\ No newline at end of file