diff options
| author | Tom Duffield <tom@chef.io> | 2020-07-24 13:55:01 -0500 |
|---|---|---|
| committer | Tom Duffield <tom@chef.io> | 2020-07-28 10:54:01 -0500 |
| commit | b604456f87fe99247a4af1b97fb3ef6c6e410bf2 (patch) | |
| tree | 06d9fa99c84a90cb46d310c7cf9b570c2e8a02c7 /Dockerfile | |
| parent | 395f9f54cef1e3cb7333d4f875e4c97e9a7123b3 (diff) | |
| download | chef-b604456f87fe99247a4af1b97fb3ef6c6e410bf2.tar.gz | |
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>
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Dockerfile b/Dockerfile index d5a4792216..4312b9d94e 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=16.3.38 -# 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 |