diff options
| author | Tim Smith <tsmith@chef.io> | 2019-08-22 12:26:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-22 12:26:28 -0400 |
| commit | 650f57ae987ae4f1e61f6c35b19edc18376c5315 (patch) | |
| tree | 73f780363933cbf7003bb2a316f9fe12d043244e | |
| parent | bd25484bbb13e10b9ce3edb0aade67f351ef28f1 (diff) | |
| parent | 2bc9ea45ea0d8ac5bdae3e4946c3b989b30145d1 (diff) | |
| download | chef-650f57ae987ae4f1e61f6c35b19edc18376c5315.tar.gz | |
Merge pull request #8840 from chef/tduffield/fix-dockerfile-14
Fix the build arguments in the Dockerfile
| -rw-r--r-- | Dockerfile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile index bc85c3aa4c..3155824e85 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,15 @@ FROM busybox -MAINTAINER Chef Software, Inc. <docker@chef.io> +LABEL maintainer="Chef Software, Inc. <docker@chef.io>" +ARG EXPEDITOR_CHANNEL ARG CHANNEL=stable +ARG EXPEDITOR_VERSION ARG VERSION=14.13.11 +# 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 |