This is an automated email from the ASF dual-hosted git repository.
rshah 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 4be02cf2be Only use 2 path components for compose file (#7939)
4be02cf2be is described below
commit 4be02cf2be7497327c3e907d5c796c1e9e357f1a
Author: Zach Hoffman <[email protected]>
AuthorDate: Thu Feb 8 10:06:59 2024 -0700
Only use 2 path components for compose file (#7939)
* Only use 2 path components for compose file
* Add optional/ to path in Dockerfile
---
.../cdn-in-a-box/optional/docker-compose.traffic-portal-v2-test.yml | 4 ++--
.../cdn-in-a-box/optional/traffic_portal_v2_e2e_test/Dockerfile | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/infrastructure/cdn-in-a-box/optional/docker-compose.traffic-portal-v2-test.yml
b/infrastructure/cdn-in-a-box/optional/docker-compose.traffic-portal-v2-test.yml
index c72bbf76b9..4c727b7a44 100644
---
a/infrastructure/cdn-in-a-box/optional/docker-compose.traffic-portal-v2-test.yml
+++
b/infrastructure/cdn-in-a-box/optional/docker-compose.traffic-portal-v2-test.yml
@@ -20,7 +20,7 @@ version: '3.8'
services:
tpv2-e2e-test:
build:
- context: ../../..
+ context: ../..
dockerfile:
infrastructure/cdn-in-a-box/optional/traffic_portal_v2_e2e_test/Dockerfile
args:
# Change BASE_IMAGE to centos when RHEL_VERSION=7
@@ -34,7 +34,7 @@ services:
domainname: infra.ciab.test
volumes:
- shared:/shared
- - ../../../junit:/junit
+ - ../../junit:/junit
volumes:
shared:
diff --git
a/infrastructure/cdn-in-a-box/optional/traffic_portal_v2_e2e_test/Dockerfile
b/infrastructure/cdn-in-a-box/optional/traffic_portal_v2_e2e_test/Dockerfile
index fd77d5f230..9972cfc994 100644
--- a/infrastructure/cdn-in-a-box/optional/traffic_portal_v2_e2e_test/Dockerfile
+++ b/infrastructure/cdn-in-a-box/optional/traffic_portal_v2_e2e_test/Dockerfile
@@ -72,7 +72,7 @@ WORKDIR /lang/traffic-portal/
RUN npm ci
COPY infrastructure/cdn-in-a-box/traffic_ops/to-access.sh \
- infrastructure/cdn-in-a-box/traffic_portal_v2_e2e_test/run.sh \
+ infrastructure/cdn-in-a-box/optional/traffic_portal_v2_e2e_test/run.sh \
infrastructure/cdn-in-a-box/dns/set-dns.sh \
infrastructure/cdn-in-a-box/dns/insert-self-into-dns.sh \
/usr/local/sbin/
