made changes to support overriding the TO_HOST env var

apache · Jun 27, 2018 · 4d40609 · 4d40609
1 parent 3eed871
commit 4d40609
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/infrastructure/cdn-in-a-box/docker-compose.yml b/infrastructure/cdn-in-a-box/docker-compose.yml
@@ -103,8 +103,6 @@ services:
       context: traffic_portal
       args:
         TRAFFIC_PORTAL_RPM: traffic_portal.rpm
-    depends_on:
-      - trafficops
     domainname: cdn.local
     env_file:
       - variables.env

diff --git a/infrastructure/cdn-in-a-box/traffic_portal/Dockerfile b/infrastructure/cdn-in-a-box/traffic_portal/Dockerfile
@@ -28,6 +28,8 @@ RUN curl -sL https://rpm.nodesource.com/setup_6.x | bash -
 ARG TRAFFIC_PORTAL_RPM=traffic_portal.rpm
 ADD $TRAFFIC_PORTAL_RPM /
 
+ARG TO_HOST=$TO_HOST
+
 # Install and delete the TRAFFIC_PORTAL_RPM when finished
 RUN yum install -y \
     epel-release && \

diff --git a/infrastructure/cdn-in-a-box/traffic_portal/run.sh b/infrastructure/cdn-in-a-box/traffic_portal/run.sh
@@ -40,6 +40,8 @@ sed -i -e "/^\s*base_url:/ s@'.*'@'https://$TO_HOST:6443/api/'@" /etc/traffic_po
 props=/opt/traffic_portal/public/traffic_portal_properties.json
 tmp=$(mktemp)
 
+echo "TO_HOST: $TO_HOST"
+
 jq --arg TO_HOST $TO_HOST '.properties.api.baseUrl = "https://"+$TO_HOST' <$props >$tmp
 mv $tmp $props