[trafficcontrol] 04/09: Squashed repetetive commands; RPM now overridable

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dangogh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git

commit df2e0b79765f406daeabb6ca6b2f2f7144067201
Author: Brennan Fieck <Br...@comcast.com>
AuthorDate: Tue Jul 24 13:57:32 2018 +0000

    Squashed repetetive commands; RPM now overridable
---
 infrastructure/cdn-in-a-box/edge/Dockerfile | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/infrastructure/cdn-in-a-box/edge/Dockerfile b/infrastructure/cdn-in-a-box/edge/Dockerfile
index 4ce93d4..84de1af 100644
--- a/infrastructure/cdn-in-a-box/edge/Dockerfile
+++ b/infrastructure/cdn-in-a-box/edge/Dockerfile
@@ -23,19 +23,13 @@
 
 FROM centos:7
 
-ADD https://ci.trafficserver.apache.org/RPMS/CentOS7/trafficserver-7.1.2-4.el7.centos.x86_64.rpm /trafficserver-7.1.2-4.el7.centos.x86_64.rpm
+ARG RPM=https://ci.trafficserver.apache.org/RPMS/CentOS7/trafficserver-7.1.2-4.el7.centos.x86_64.rpm
+ADD $RPM /trafficserver.rpm
 
-RUN yum install -y /trafficserver-7.1.2-4.el7.centos.x86_64.rpm iproute net-tools nmap-ncat && yum clean all
+RUN yum install -y /trafficserver.rpm iproute net-tools nmap-ncat && yum clean all
 
-RUN chown -R ats:ats /etc/trafficserver/
-RUN mkdir -p /var/trafficserver/cache
-RUN chown -R ats:ats /var/trafficserver/
-RUN mkdir -p /opt/ort
-RUN chown ats:ats /opt/ort
-ADD parameters.json /parameters.json
-ADD profile.json /profile.json
-ADD server.json /server.json
-ADD setup.sh /setup.sh
+RUN mkdir -p /var/trafficserver/cache /opt/ort && chown -R ats:ats /etc/trafficserver/ /var/trafficserver/ /opt/ort
+ADD parameters.json profile.json server.json setup.sh /
 
 EXPOSE 80