You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by oc...@apache.org on 2021/01/11 15:13:56 UTC

[trafficcontrol] branch master updated: CDN in a Box: Origin fixes (#5388)

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

ocket8888 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 849999f  CDN in a Box: Origin fixes (#5388)
849999f is described below

commit 849999ff1a0b26b7f01ff7be3f208d3228dff6dd
Author: Zach Hoffman <zr...@apache.org>
AuthorDate: Mon Jan 11 08:13:41 2021 -0700

    CDN in a Box: Origin fixes (#5388)
    
    * Enable multiSiteOrigin
    
    * Install route command that has -6 option, unlike busybox
---
 infrastructure/cdn-in-a-box/origin/Dockerfile                          | 3 +++
 .../cdn-in-a-box/traffic_ops_data/deliveryservices/010-ciab.json       | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/infrastructure/cdn-in-a-box/origin/Dockerfile b/infrastructure/cdn-in-a-box/origin/Dockerfile
index b95fee7..d2114fd 100644
--- a/infrastructure/cdn-in-a-box/origin/Dockerfile
+++ b/infrastructure/cdn-in-a-box/origin/Dockerfile
@@ -23,6 +23,7 @@
 FROM alpine:latest
 
 RUN apk add --no-cache \
+    net-tools \
     lighttpd \
     bash \
     curl \
@@ -31,6 +32,8 @@ RUN apk add --no-cache \
     gettext \
     jq
 
+RUN rm /sbin/route
+
 RUN rm /etc/lighttpd/lighttpd.conf
 RUN rm -rf /var/www/localhost/
 
diff --git a/infrastructure/cdn-in-a-box/traffic_ops_data/deliveryservices/010-ciab.json b/infrastructure/cdn-in-a-box/traffic_ops_data/deliveryservices/010-ciab.json
index c0378df..eb24f98 100644
--- a/infrastructure/cdn-in-a-box/traffic_ops_data/deliveryservices/010-ciab.json
+++ b/infrastructure/cdn-in-a-box/traffic_ops_data/deliveryservices/010-ciab.json
@@ -15,7 +15,7 @@
     "ipv6RoutingEnabled": true,
     "logsEnabled": true,
     "longDesc": "Apachecon North America 2018",
-    "multiSiteOrigin": false,
+    "multiSiteOrigin": true,
     "missLat": 42.0,
     "missLong": -88.0,
     "qstringIgnore": 0,