[trafficcontrol] 04/10: Changed cache build context to avoid copying to-access.sh

[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 6829562f9750760b27ad524a1f089c572a057c35
Author: Brennan Fieck <Br...@comcast.com>
AuthorDate: Wed Aug 15 13:26:09 2018 +0000

    Changed cache build context to avoid copying to-access.sh
---
 infrastructure/cdn-in-a-box/README.md          | 8 --------
 infrastructure/cdn-in-a-box/docker-compose.yml | 6 ++++--
 infrastructure/cdn-in-a-box/edge/Dockerfile    | 6 ++----
 infrastructure/cdn-in-a-box/mid/Dockerfile     | 4 +---
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/infrastructure/cdn-in-a-box/README.md b/infrastructure/cdn-in-a-box/README.md
index 2f3e55b..20393c1 100644
--- a/infrastructure/cdn-in-a-box/README.md
+++ b/infrastructure/cdn-in-a-box/README.md
@@ -49,14 +49,6 @@ respective component directories, such that their filenames are as follows:
 * `traffic_ops/traffic_ops.rpm`
 * `traffic_portal/traffic_portal.rpm`
 
-Also ensure that the edge- and mid-tier caches have copies of the
-[`traffic_ops/to-access.sh`](./traffic_ops/to-access) script in their own directories.
-From this directory, you can accomplish this by running:
-
-```bash
-cp -f traffic_ops/to-access.sh edge/to-access.sh && cp -f traffic_ops/to-access.sh mid/to-access.sh
-```
-
 Finally, run the test CDN using the command:
 
 ```bash
diff --git a/infrastructure/cdn-in-a-box/docker-compose.yml b/infrastructure/cdn-in-a-box/docker-compose.yml
index 6428728..4e70aae 100644
--- a/infrastructure/cdn-in-a-box/docker-compose.yml
+++ b/infrastructure/cdn-in-a-box/docker-compose.yml
@@ -164,7 +164,8 @@ services:
   # edge cache
   edge:
     build:
-      context: edge
+      context: .
+      dockerfile: edge/Dockerfile
     domainname: cdn.local
     env_file:
       - variables.env
@@ -177,7 +178,8 @@ services:
   # mid cache
   mid:
     build:
-      context: mid
+      context: .
+      dockerfile: mid/Dockerfile
     domainname: cdn.local
     env_file:
       - variables.env
diff --git a/infrastructure/cdn-in-a-box/edge/Dockerfile b/infrastructure/cdn-in-a-box/edge/Dockerfile
index 8dc416a..7484de4 100644
--- a/infrastructure/cdn-in-a-box/edge/Dockerfile
+++ b/infrastructure/cdn-in-a-box/edge/Dockerfile
@@ -23,17 +23,15 @@
 
 FROM centos:7
 
-ARG TO_API_FUNCTIONS=to-access.sh
 ARG RPM=https://ci.trafficserver.apache.org/RPMS/CentOS7/trafficserver-7.1.2-4.el7.centos.x86_64.rpm
-ADD $TO_API_FUNCTIONS /to-access.sh
 ADD $RPM /trafficserver.rpm
-ADD traffic_ops_ort.rpm /
+ADD edge/traffic_ops_ort.rpm /
 
 RUN yum install -y /trafficserver.rpm iproute net-tools nmap-ncat epel-release
 RUN yum install -y jq && yum clean all
 
 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 /
+ADD edge/parameters.json edge/profile.json edge/server.json edge/setup.sh traffic_ops/to-access.sh /
 
 EXPOSE 80
 
diff --git a/infrastructure/cdn-in-a-box/mid/Dockerfile b/infrastructure/cdn-in-a-box/mid/Dockerfile
index a04fc1d..a1dab81 100644
--- a/infrastructure/cdn-in-a-box/mid/Dockerfile
+++ b/infrastructure/cdn-in-a-box/mid/Dockerfile
@@ -23,9 +23,7 @@
 
 FROM centos:7
 
-ARG TO_API_FUNCTIONS=to-access.sh
 ARG RPM=https://ci.trafficserver.apache.org/RPMS/CentOS7/trafficserver-7.1.2-4.el7.centos.x86_64.rpm
-ADD $TO_API_FUNCTIONS /to-access.sh
 ADD $RPM /trafficserver.rpm
 
 RUN yum install -y epel-release
@@ -33,7 +31,7 @@ RUN yum install -y /trafficserver.rpm iproute jq net-tools nmap-ncat && yum clea
 
 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 /
+ADD mid/parameters.json mid/profile.json mid/server.json mid/setup.sh traffic_ops/to-access.sh /
 
 EXPOSE 80