-
Notifications
You must be signed in to change notification settings - Fork 162
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
tools: specify project name in docker-compose files #4396
Conversation
9f8c967
to
6fb92e3
Compare
e26deb3
to
84a1628
Compare
84a1628
to
d0faa46
Compare
The compatibility flag affects what word separator is used in the container name. > Compose generates container names based on the project name, service name, and scale/replica count. > In Compose V1, an underscore (_) was used as the word separator. In Compose V2, a hyphen (-) is used as the word separator. We don't usually rely on specific container names, so this should be fine. In some exception cases where this seems more practical (containers for bazel-remote-cache and go-module-proxy) due to special casing in the CI scripts, container_name is set explicitly.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 22 of 22 files at r1, all commit messages.
Reviewable status: complete! all files reviewed, all discussions resolved (waiting on @matzf)
Just as a heads-up for developers using the |
Simplify the usage of the various docker-compose configurations by including the project name in the configuration file. This has been supported for a while now in docker-compose v2. This allows to drop the `-p`/`--project-name` from all `docker-compose` incantations. Also, streamline the docker-compose files generated by the topogen scripts; remove the explicit `container_name` configurations and drop all the explicit `scion_` prefixes -- managing these prefixes is docker-compose's job. Shut up the warnings on "SCION_EXPERIMENTAL_... variable is not set. Defaulting to a blank string." by using the variable expansion syntax to explicitly default to a blank string. Also, drop the `docker compose` `--compatibility` flag. The compatibility flag affects what word separator is used in the container name and it has long been deprecated. We don't usually rely on specific container names, so this should be fine. In some exception cases where expecting specific container names seems more practical (containers for bazel-remote-cache and go-module-proxy) due to special casing in the CI scripts, container_name is set explicitly.
Simplify the usage of the various docker-compose configurations by including the project name in the configuration file. This has been supported for a while now in docker-compose v2. This allows to drop the
-p
/--project-name
from alldocker-compose
incantations.Also, streamline the docker-compose files generated by the topogen scripts; remove the explicit
container_name
configurations and drop all the explicitscion_
prefixes -- managing these prefixes is docker-compose's job.Shut up the warnings on "SCION_EXPERIMENTAL_... variable is not set. Defaulting to a blank string." by using the variable expansion syntax to explicitly default to a blank string.
Also, drop the
docker compose
--compatibility
flag. The compatibility flag affects what word separator is used in thecontainer name and it has long been deprecated. We don't usually rely on specific container names, so this should be
fine. In some exception cases where expecting specific container names seems more practical (containers for bazel-remote-cache and go-module-proxy) due to special casing in the CI scripts, container_name is set explicitly.
This change is