Skip to content

Commit

Permalink
test: Pass domregkey to compose app
Browse files Browse the repository at this point in the history
The app needs access to the domain registration key. Also pass validate
API and token expiration for good measures.

Signed-off-by: Christian Heimes <cheimes@redhat.com>
  • Loading branch information
tiran committed Sep 27, 2023
1 parent c27685e commit cbe1388
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
3 changes: 3 additions & 0 deletions deployments/backend-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ services:
- DATABASE_NAME=${DATABASE_NAME:-idmsvc-db}
- DATABASE_USER=${DATABASE_USER:-idmsvc-user}
- DATABASE_PASSWORD=${DATABASE_PASSWORD:-idmsvc-secret}
- APP_DOMAIN_REG_KEY=${APP_DOMAIN_REG_KEY:-random}
- APP_VALIDATE_API=${APP_VALIDATE_API:-false}
- APP_TOKEN_EXPIRATION_SECONDS=${APP_TOKEN_EXPIRATION_SECONDS:-3600}
depends_on:
database:
condition: service_healthy
Expand Down
8 changes: 7 additions & 1 deletion scripts/mk/compose.mk
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,17 @@ COMPOSE_VARS_KAFKA=\
ZOOKEEPER_CLIENT_PORT=$(ZOOKEEPER_CLIENT_PORT) \
KAFKA_TOPICS=$(KAFKA_TOPICS)

COMPOSE_VARS_APP=\
APP_DOMAIN_REG_KEY="$(APP_DOMAIN_REG_KEY)" \
APP_VALIDATE_API=$(APP_VALIDATE_API) \
APP_TOKEN_EXPIRATION_SECONDS=$(APP_TOKEN_EXPIRATION_SECONDS)

COMPOSE_VARS= \
CONTAINER_IMAGE_BASE="$(CONTAINER_IMAGE_BASE)" \
CONTAINER_IMAGE_TAG="$(CONTAINER_IMAGE_TAG)" \
$(COMPOSE_VARS_DATABASE) \
$(COMPOSE_VARS_KAFKA)
$(COMPOSE_VARS_KAFKA) \
$(COMPOSE_VARS_APP)


.PHONY: compose-up
Expand Down

0 comments on commit cbe1388

Please sign in to comment.