From 75f801e005f41bf0ecf526b2799f315dd8f6b12e Mon Sep 17 00:00:00 2001 From: Zach Hoffman Date: Wed, 7 Feb 2024 19:12:25 -0700 Subject: [PATCH 1/2] Only use 2 path components for compose file --- .../optional/docker-compose.traffic-portal-v2-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 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: From 09e1d2ff5b62b84c992e0f14770811c1b970a1b6 Mon Sep 17 00:00:00 2001 From: Zach Hoffman Date: Thu, 8 Feb 2024 01:12:04 -0700 Subject: [PATCH 2/2] Add optional/ to path in Dockerfile --- .../cdn-in-a-box/optional/traffic_portal_v2_e2e_test/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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/