diff options
| author | Tom Duffield <tom@chef.io> | 2019-08-22 10:47:52 -0500 |
|---|---|---|
| committer | Tom Duffield <tom@chef.io> | 2019-08-22 10:47:52 -0500 |
| commit | 9032969e8327efc49fcf7d5af32fd6829c49b5e1 (patch) | |
| tree | dfd7f7a8b6baac04912f6f9bd68caf427ebac2ad | |
| parent | 39cf0beb9ccc0fa0f60fa9d52b3c0a2bccc6c0f1 (diff) | |
| download | chef-9032969e8327efc49fcf7d5af32fd6829c49b5e1.tar.gz | |
Fix the build arguments in the Dockerfile
We need to support the prefixed `EXPEDITOR_` build arguments in our
Dockerfile. We are leaving the non-prefixed arguments in there for
back-compat.
Signed-off-by: Tom Duffield <tom@chef.io>
| -rw-r--r-- | Dockerfile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile index cd3fdbce8e..437511e9cf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,11 +15,17 @@ # applied so 15.0.260 would be tagged as "latest", "15" and "15.0", as well as "15.0.260". 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=15.2.20 +# 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 |