Skip to content
This repository was archived by the owner on Nov 24, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions infrastructure/cdn-in-a-box/cache/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@ ADD infrastructure/cdn-in-a-box/cache/run.sh infrastructure/cdn-in-a-box/traffic

ARG ORT_RPM=infrastructure/cdn-in-a-box/cache/traffic_ops_ort.rpm
ADD $ORT_RPM /
RUN yum install -y /$(basename $ORT_RPM) &&\
rm /$(basename $ORT_RPM) && \
yum -y clean all
RUN rpm -Uvh --nodeps /$(basename $ORT_RPM) &&\
rm /$(basename $ORT_RPM)

CMD /run.sh
3 changes: 1 addition & 2 deletions infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ FROM trafficops-perl-deps
# Override TRAFFIC_OPS_RPM arg to use a different one using --build-arg TRAFFIC_OPS_RPM=... Can be local file or http://...
ARG TRAFFIC_OPS_RPM=infrastructure/cdn-in-a-box/traffic_ops/traffic_ops.rpm
ADD $TRAFFIC_OPS_RPM /
RUN yum install -y /$(basename $TRAFFIC_OPS_RPM) && \
RUN rpm -Uvh /$(basename $TRAFFIC_OPS_RPM) && \
rm /$(basename $TRAFFIC_OPS_RPM) && \
yum -y clean all && \
rm /opt/traffic_ops/app/bin/traffic_ops_golang

# Run carton again, in case the cpanfile included in the RPM differs from the one used earlier in the
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ ARG TRAFFIC_OPS_RPM=traffic_ops/traffic_ops.rpm

COPY $TRAFFIC_OPS_RPM /
RUN to_rpm_filename="$(basename $TRAFFIC_OPS_RPM)" && \
rpm --install --nodeps --verbose --hash "$to_rpm_filename" && \
rpm -Uvh --nodeps "$to_rpm_filename" && \
rm "$to_rpm_filename"

COPY enroller/server_template.json \
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/cdn-in-a-box/traffic_portal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ RUN yum install -y \
echo "ERROR INSTALLING PACKAGES"

ADD $TRAFFIC_PORTAL_RPM /
RUN yum install -y /$(basename $TRAFFIC_PORTAL_RPM) && \
RUN rpm -Uvh /$(basename $TRAFFIC_PORTAL_RPM) && \
rm /$(basename $TRAFFIC_PORTAL_RPM)

ADD enroller/server_template.json \
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/cdn-in-a-box/traffic_router/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ RUN yum -y install epel-release && \
ADD $TRAFFIC_ROUTER_RPM /traffic_router.rpm
ADD $TOMCAT_RPM /tomcat.rpm

RUN yum -y install /traffic_router.rpm /tomcat.rpm && \
RUN rpm -Uvh /traffic_router.rpm /tomcat.rpm && \
find /usr/lib* -name libtc\* -exec ln -sfv {} /opt/tomcat/lib \;

ADD enroller/server_template.json \
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/cdn-in-a-box/traffic_stats/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN yum install -y epel-release && \
yum clean all

ADD $TRAFFIC_TS_RPM /
RUN yum install -y /$(basename $TRAFFIC_TS_RPM) \
RUN rpm -Uvh /$(basename $TRAFFIC_TS_RPM) && \
rm /$(basename $TRAFFIC_TS_RPM)

ADD enroller/server_template.json \
Expand Down