Skip to content
This repository was archived by the owner on Nov 24, 2025. It is now read-only.

Only use 2 path components for compose file#7939

Merged
rimashah25 merged 2 commits intoapache:masterfrom
zrhoffman:2-path-components
Feb 8, 2024
Merged

Only use 2 path components for compose file#7939
rimashah25 merged 2 commits intoapache:masterfrom
zrhoffman:2-path-components

Conversation

@zrhoffman
Copy link
Member

This PR fixes some issues with paths in optional/docker-compose.traffic-portal-v2-test.yml that arose when it was moved to the optional directory. Apparently docker-compose always uses the directory that the first compose file specified with -f is in for the base of all relative paths.


Which Traffic Control components are affected by this PR?

  • CDN in a Box

What is the best way to verify this PR?

cd infrastructure/cdn-in-a-box
docker-compose -f docker-compose.yml -f optional/docker-compose.traffic-portal-v2.yml -f optional/docker-compose.traffic-portal-v2-test.yml build tpv2-e2e-test
docker-compose -f docker-compose.yml -f optional/docker-compose.traffic-portal-v2.yml -f optional/docker-compose.traffic-portal-v2-test.yml up --no-deps tpv2-e2e-test

(It's fine if it starts to start up as long as building the docker image succeeded, we're mainly only testing that the compose file can be used.)

Related PRs: #7938, #7936, #7925

If this is a bugfix, which Traffic Control versions contained the bug?

PR submission checklist

@zrhoffman zrhoffman added regression bug a bug in existing functionality introduced by a new version cdn-in-a-box related to the Docker-based CDN-in-a-Box system Traffic Portal v2 Related to the experimental Traffic Portal version 2 labels Feb 8, 2024
Copy link
Contributor

@rimashah25 rimashah25 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@rimashah25 rimashah25 merged commit 4be02cf into apache:master Feb 8, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

cdn-in-a-box related to the Docker-based CDN-in-a-Box system regression bug a bug in existing functionality introduced by a new version Traffic Portal v2 Related to the experimental Traffic Portal version 2

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants