Use docker compose plugin
#8056
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
added
bug
have the compose plugin
zrhoffman
added a commit
to zrhoffman/trafficcontrol
that referenced
this pull request
Sep 27, 2024
* docker-compose -> docker compose
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"')
* Remove version from compose files.
sed -i '/^version:/d' $(git grep -il '^version:' '*docker-compose*.y*ml')
* Include `--all` in docker-compose ps command.
This is necessary for the plugin version of docker compose to query
exited containers.
* Changelog entry
* Support docker compose fallback for older docker versions that do not
have the compose plugin
zrhoffman
added a commit
to zrhoffman/trafficcontrol
that referenced
this pull request
Sep 27, 2024
* docker-compose -> docker compose
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"')
* Remove version from compose files.
sed -i '/^version:/d' $(git grep -il '^version:' '*docker-compose*.y*ml')
* Include `--all` in docker-compose ps command.
This is necessary for the plugin version of docker compose to query
exited containers.
* Changelog entry
* Support docker compose fallback for older docker versions that do not
have the compose plugin
rimashah25
pushed a commit
to rimashah25/trafficcontrol
that referenced
this pull request
Sep 27, 2024
rimashah25
pushed a commit
to rimashah25/trafficcontrol
that referenced
this pull request
Sep 27, 2024
rimashah25
pushed a commit
to rimashah25/trafficcontrol
that referenced
this pull request
Sep 27, 2024
* docker-compose -> docker compose
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"')
* Remove version from compose files.
sed -i '/^version:/d' $(git grep -il '^version:' '*docker-compose*.y*ml')
* Include `--all` in docker-compose ps command.
This is necessary for the plugin version of docker compose to query
exited containers.
* Changelog entry
* Support docker compose fallback for older docker versions that do not
have the compose plugin
zrhoffman
added a commit
that referenced
this pull request
Sep 27, 2024
* Updated version * Updated changelog * Use `docker compose` plugin (#8056) * docker-compose -> docker compose 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"') * Remove version from compose files. sed -i '/^version:/d' $(git grep -il '^version:' '*docker-compose*.y*ml') * Include `--all` in docker-compose ps command. This is necessary for the plugin version of docker compose to query exited containers. * Changelog entry * Support docker compose fallback for older docker versions that do not have the compose plugin * Improve PUT /deliveryservice_request_comments id (#8071) * Update actions/upload-artifact and actions/download-artifact to v4 (#8081) Fixes message: This request has been automatically failed because it uses a deprecated version of `actions/upload-artifact: v2`. Learn more: https://github.blog/changelog/2024-02-13-deprecation-notice-v1-and-v2-of-the-artifact-actions/ * Update Postgres version to 13.16 (#8079) * Use :atc-postgres-version: role in documentation * Get postgres version from .env in Traffic Ops spec file * Get POSTGRES_VERSION from .env in Dockerfiles and docker-compose files * Update Postgres version to 13.16 * Update Trafficserver Alpine image to 9.2.4 (#7994) * No substitution in the name * Download ATS from the Apache archive download.apache.org only contains currently-supported releases. * Use Alpine main repo version 3.16 for adding package libexecinfo-dev Alpine versions above 3.16 do not contain package libexecinfo-dev, which ATS needs. Alpine 3.19 still fails for unknown reasons, but Alpine 3.18 builds with this fix. * Set default for GITHUB_REPOSITORY * Update Apache Traffic Server to 9.2.4 (cherry picked from commit 14007e3) * Update Go version to 1.23.1 (#8073) Co-authored-by: asf-ci-trafficcontrol <asf-ci-trafficcontrol@users.noreply.github.com> (cherry picked from commit f647d58) * Update Chromedriver Versions (#8084) Update chromedriver (cherry picked from commit 289c2c3) * Update Go version to 1.22.5 (#8034) * Update Go version to 1.22.5 * Update some images to Rocky Linux 8 --------- Co-authored-by: asf-ci-trafficcontrol <asf-ci-trafficcontrol@users.noreply.github.com> Co-authored-by: Zach Hoffman <zrhoffman@apache.org> (cherry picked from commit 0b21b43) * Update changelog-1 and ciab.yml * Update Go version to 1.23.1 (#8073) Co-authored-by: asf-ci-trafficcontrol <asf-ci-trafficcontrol@users.noreply.github.com> (cherry picked from commit f647d58) --------- Co-authored-by: Zach Hoffman <zrhoffman@apache.org> Co-authored-by: asf-ci-trafficcontrol <127552316+asf-ci-trafficcontrol@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#8056 fixes #8055 removing the
versionkey from compose files and making the project usedocker composeinstead ofdocker-compose.Which Traffic Control components are affected by this PR?
t3c, formerly ORT)What is the best way to verify this PR?
Verify that the GitHub Actions pass now.
PR submission checklist