Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use docker compose plugin #8056

Merged
merged 5 commits into from
Aug 8, 2024
Merged

Conversation

zrhoffman
Copy link
Member

#8056 fixes #8055 removing the version key from compose files and making the project use docker compose instead of docker-compose.


Which Traffic Control components are affected by this PR?

  • Traffic Control Cache Config (t3c, formerly ORT)
  • Traffic Control Health Client (t3c-health-client)
  • Traffic Monitor
  • Traffic Ops
  • Traffic Portal
  • Documentation
  • CDN in a Box
  • Automation

What is the best way to verify this PR?

Verify that the GitHub Actions pass now.

PR submission checklist

Excludes Dockerfile-tsb and the vendor directory.

    sed -i 's/docker-compose /docker compose /g' $(git grep -l 'docker-compose ')
    pattern="$(<<'PATTERN' cat
    docker-compose\($\|['`"*,)]\)
    PATTERN
    )"
    sed -i "s/${pattern}/docker compose\1/g" -- $(git grep -l "$pattern")
    sed -i 's/"docker compose"/"docker", "compose"/g' $(git grep -Fl '"docker compose"')
sed -i '/^version:/d' $(git grep -il '^version:' '*docker-compose*.y*ml')
This is necessary for the plugin version of docker compose to query
exited containers.
@zrhoffman zrhoffman added bug something isn't working as intended Traffic Ops related to Traffic Ops Traffic Monitor related to Traffic Monitor Traffic Portal v1 related to Traffic Portal version 1 documentation related to documentation cdn-in-a-box related to the Docker-based CDN-in-a-Box system build related to the build process database relating to setup/installation/structure of the Traffic Ops database cache-config Cache config generation automation related to automated testing/deployment/packaging etc. tc-health-client Traffic Control Health Client dev-ciab Related to CDN in a Box for Developers labels Aug 7, 2024
@rawlinp rawlinp merged commit 8a84c50 into apache:master Aug 8, 2024
37 checks passed
@zrhoffman zrhoffman deleted the docker-compose-plugin branch August 8, 2024 17:29
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.

Approved.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automation related to automated testing/deployment/packaging etc. bug something isn't working as intended build related to the build process cache-config Cache config generation cdn-in-a-box related to the Docker-based CDN-in-a-Box system database relating to setup/installation/structure of the Traffic Ops database dev-ciab Related to CDN in a Box for Developers documentation related to documentation tc-health-client Traffic Control Health Client Traffic Monitor related to Traffic Monitor Traffic Ops related to Traffic Ops Traffic Portal v1 related to Traffic Portal version 1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Version in "././infrastructure/docker/build/docker-compose.yml" is unsupported
3 participants