-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
compose.yaml: autopair first-party leader
To enable the demo workflow, users will need to pair two aggregators with the control plane. Further, one of them must be first-party, which can only be done using a CLI built with feature `admin`. But the one we distribute via GitHub releases isn't, and I argue it shouldn't be, which means that demo users can't appropriately pair aggregators. We could provide a `curl` or `wget` command that'd do it, but as it turns out, we already bundle the `divviup` CLI in the `divviup_api` container, so let's just use that, since the API URL and token for the aggregators are static! This commit: - adds feature `admin` to builds of `divviup_api_integration_test` in `docker-release.yaml` so that the bundled CLI will have `--first-party` and `--shared` - adds a service `pair_aggregator` to `compose.yaml` that uses the `/divviup` entrypoint to pair `janus_1_aggregator` as a first-party, shared aggregator - adds a stanza for `pair_aggregator` to `compose.dev.override.yaml` - makes `compose.dev.override.yaml` build all images with features `integration_test,admin` Part of #1096
- Loading branch information
1 parent
8185776
commit 900d180
Showing
3 changed files
with
44 additions
and
13 deletions.
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,31 +1,40 @@ | ||
# Overrides for the local development docker compose setup. Meant only to be used by | ||
# compose.dev.yaml | ||
|
||
x-build: &build | ||
build: | ||
context: . | ||
args: | ||
RUST_PROFILE: dev | ||
# We don't need both of these features in all three services, but it allows reusing one | ||
# container image for both this and the divviup_api service. | ||
RUST_FEATURES: integration-testing,admin | ||
|
||
services: | ||
divviup_api: | ||
image: !reset null | ||
build: | ||
context: . | ||
args: | ||
RUST_PROFILE: dev | ||
RUST_FEATURES: integration-testing | ||
<<: *build | ||
develop: | ||
watch: | ||
- path: src/ | ||
action: rebuild | ||
|
||
divviup_api_migrate: | ||
image: !reset null | ||
build: | ||
context: . | ||
args: | ||
RUST_PROFILE: dev | ||
# This isn't strictly required for migrations, but it allows reusing one container image | ||
# for both this and the divviup_api service. | ||
RUST_FEATURES: integration-testing | ||
<<: *build | ||
develop: | ||
watch: | ||
- path: migration | ||
action: rebuild | ||
ignore: | ||
- README.md | ||
|
||
pair_aggregator: | ||
image: !reset null | ||
<<: *build | ||
develop: | ||
watch: | ||
- path: cli/ | ||
action: rebuild | ||
- path: client/ | ||
action: rebuild |
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