summaryrefslogtreecommitdiff
path: root/Dockerfile
diff options
context:
space:
mode:
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile8
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