[trafficcontrol] branch master updated: Fix arg placement in TM/TS Dockerfile (#5888)

[zr...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new b96aa97  Fix arg placement in TM/TS Dockerfile (#5888)
b96aa97 is described below

commit b96aa9725b6d317225a09ec6b2c7e7f7be18c435
Author: Steve Hamrick <sh...@users.noreply.github.com>
AuthorDate: Tue May 25 17:37:19 2021 -0600

    Fix arg placement in TM/TS Dockerfile (#5888)
    
    * Fix arg placement
    
    * Remove newline
---
 infrastructure/cdn-in-a-box/traffic_monitor/Dockerfile | 6 +++---
 infrastructure/cdn-in-a-box/traffic_stats/Dockerfile   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/infrastructure/cdn-in-a-box/traffic_monitor/Dockerfile b/infrastructure/cdn-in-a-box/traffic_monitor/Dockerfile
index de3fd82..ad85141 100644
--- a/infrastructure/cdn-in-a-box/traffic_monitor/Dockerfile
+++ b/infrastructure/cdn-in-a-box/traffic_monitor/Dockerfile
@@ -27,9 +27,6 @@ RUN if [[ "${RHEL_VERSION%%.*}" -eq 7 ]]; then \
         yum -y install dnf || exit 1; \
     fi
 
-# Default values for RPM -- override with `docker build --build-arg RPM=...'
-ARG RPM=traffic_monitor/traffic_monitor.rpm
-
 RUN dnf install -y epel-release && \
     dnf install -y \
         jq \
@@ -43,6 +40,9 @@ RUN dnf install -y epel-release && \
     dnf clean all
 
 FROM trafficmonitor-dependencies AS trafficmonitor
+
+# Default values for RPM -- override with `docker build --build-arg RPM=...'
+ARG RPM=traffic_monitor/traffic_monitor.rpm
 ADD $RPM /
 RUN rpm -Uvh  /$(basename $RPM) && \
     rm /$(basename $RPM)
diff --git a/infrastructure/cdn-in-a-box/traffic_stats/Dockerfile b/infrastructure/cdn-in-a-box/traffic_stats/Dockerfile
index 4a25485..b611bd8 100644
--- a/infrastructure/cdn-in-a-box/traffic_stats/Dockerfile
+++ b/infrastructure/cdn-in-a-box/traffic_stats/Dockerfile
@@ -27,9 +27,6 @@ RUN if [[ "${RHEL_VERSION%%.*}" -eq 7 ]]; then \
         yum -y install dnf || exit 1; \
     fi
 
-# Default values for RPM -- override with `docker build --build-arg RPM=...'
-ARG TRAFFIC_TS_RPM=traffic_stats/traffic_stats.rpm
-
 RUN dnf install -y epel-release && \
     dnf install -y \
         jq \
@@ -41,6 +38,9 @@ RUN dnf install -y epel-release && \
     dnf clean all
 
 FROM trafficstats-dependencies AS trafficstats
+
+# Default values for RPM -- override with `docker build --build-arg RPM=...'
+ARG TRAFFIC_TS_RPM=traffic_stats/traffic_stats.rpm
 ADD $TRAFFIC_TS_RPM /
 RUN rpm -Uvh /$(basename $TRAFFIC_TS_RPM) && \
     rm /$(basename $TRAFFIC_TS_RPM)