Use Dobi for container building

This config matches chef 16

Signed-off-by: Tim Smith <tsmith@chef.io>

5 files changed, 34 insertions, 20 deletions

diff --git a/.expeditor/build.docker.yml b/.expeditor/build.docker.yml
new file mode 100644
index 0000000000..fed7a9cfaa
--- /dev/null
+++ b/.expeditor/build.docker.yml
@@ -0,0 +1 @@
+image_registry: chef
\ No newline at end of file
diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index 73c7dfb100..29a43d5422 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -1,8 +1,5 @@
 # Documentation available at https://expeditor.chef.io/docs/getting-started/
 ---
-# the name we use for this project when interacting with expeditor chatbot
-project:
-  alias: chef-15
 
 # The name of the product keys for this product (from mixlib-install)
 product_key:
@@ -20,12 +17,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
@@ -52,11 +47,11 @@ github:
   # for building.
   release_branch:
     - master:
+        version_constraint: 17*
+    - chef-16:
         version_constraint: 16*
     - chef-15:
         version_constraint: 15*
-    - chef-14:
-        version_constraint: 14*
 
 changelog:
   rollup_header: Changes not yet released to stable
@@ -88,15 +83,15 @@ subscriptions:
   # the omnibus/docker/gem chain
   - workload: artifact_published:unstable:chef:{{version_constraint}}
     actions:
-      - built_in:build_docker_image
+      - trigger_pipeline:docker/build
   - workload: artifact_published:current:chef:{{version_constraint}}
     actions:
-      - built_in:tag_docker_image
+      - built_in:promote_docker_images
   - workload: artifact_published:stable:chef:{{version_constraint}}
     actions:
       - built_in:rollover_changelog
       - bash:.expeditor/update_dockerfile.sh
-      - built_in:tag_docker_image
+      - built_in:promote_docker_images
       - built_in:publish_rubygems
       - built_in:promote_habitat_packages
       - built_in:notify_chefio_slack_channels
diff --git a/.gitignore b/.gitignore
index 6b629bde78..0699f6f70f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,9 @@ tags
 results
 *.swp
 
+# Docker
+.dobi
+
 # You should check in your Gemfile.lock in applications, and not in gems
 external_tests/*.lock
 /Gemfile.local
@@ -83,10 +86,10 @@ ext/win32-eventlog/chef-log.man
 distro/powershell/chef/chef.psm1
 
 # tool logs
-ext/win32-eventlog/mkmf.log
+mkmf.log
 
 # ignore byebug command history file.
 .byebug_history
 
-# our custom dictionary
+# our custom dictionary pulled from https://github.com/chef/chef_dictionary/
 chef_dictionary.txt
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index ce5b919349..d478647810 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,20 +12,14 @@
 #
 # When a build is promoted to our "stable" channel .expeditor/update_dockerfile.sh is run to update the version
 # in this file and also tag that image as "latest" on Docker Hub. Additionally major and minor tags will be
-# applied so 15.0.260 would be tagged as "latest", "15" and "15.0", as well as "15.0.260".
+# applied so 15.0.260 would be tagged as "latest", "stable", "15" and "15.0", as well as "15.0.260".
 
 FROM busybox
 LABEL maintainer="Chef Software, Inc. <docker@chef.io>"
 
-ARG EXPEDITOR_CHANNEL
 ARG CHANNEL=stable
-ARG EXPEDITOR_VERSION
 ARG VERSION=15.15.0
 
-# Allow the build arg below to be controlled by either build arguments
-ENV VERSION ${EXPEDITOR_VERSION:-${VERSION}}
-ENV CHANNEL ${EXPEDITOR_CHANNEL:-${CHANNEL}}
-
 RUN wget "http://packages.chef.io/files/${CHANNEL}/chef/${VERSION}/el/6/chef-${VERSION}-1.el6.x86_64.rpm" -O /tmp/chef-client.rpm && \
     rpm2cpio /tmp/chef-client.rpm | cpio -idmv && \
     rm -rf /tmp/chef-client.rpm
diff --git a/dobi.yaml b/dobi.yaml
new file mode 100644
index 0000000000..b038f8c411
--- /dev/null
+++ b/dobi.yaml
@@ -0,0 +1,21 @@
+# 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.EXPEDITOR_VERSION}'
+  args:
+    VERSION: '{env.EXPEDITOR_VERSION}'
+    CHANNEL: unstable
+  annotations:
+    tags:
+      - expeditor:final-channel-tags={{major}},{{major}}.{{minor}}
\ No newline at end of file