From ea178f9aff0a72b9438fce888294a8b0e5139832 Mon Sep 17 00:00:00 2001 From: Parag Ekbote Date: Fri, 13 Dec 2024 16:01:50 +0000 Subject: [PATCH] update makefiles and .yml files for docker --- e2e/Makefile | 1 + tools/docker-compose-dataset-viewer.yml | 3 +++ tools/docker-compose-dev-dataset-viewer.yml | 5 +++++ 3 files changed, 9 insertions(+) diff --git a/e2e/Makefile b/e2e/Makefile index 655ec0b738..a4f2c0a3ad 100644 --- a/e2e/Makefile +++ b/e2e/Makefile @@ -3,6 +3,7 @@ export ADMIN_UVICORN_NUM_WORKERS := 2 export ADMIN_UVICORN_PORT := 9081 export API_HF_JWT_ALGORITHM := EdDSA export API_HF_JWT_PUBLIC_KEY_URL := https://hub-ci.huggingface.co/api/keys/jwt +export API_HF_JWT_ADDITIONAL_PUBLIC_KEYS := # ^ it's not tested in the e2e tests, but it's good to ensure we're able to fetch it at least. export ADMIN_HF_TIMEOUT_SECONDS := 10 export API_HF_TIMEOUT_SECONDS := 10 diff --git a/tools/docker-compose-dataset-viewer.yml b/tools/docker-compose-dataset-viewer.yml index eb690a49f8..db4fdd9f23 100644 --- a/tools/docker-compose-dataset-viewer.yml +++ b/tools/docker-compose-dataset-viewer.yml @@ -45,6 +45,9 @@ services: ADMIN_HF_TIMEOUT_SECONDS: ${ADMIN_HF_TIMEOUT_SECONDS-0.2} ADMIN_HF_WHOAMI_PATH: ${ADMIN_HF_WHOAMI_PATH-/api/whoami-v2} ADMIN_MAX_AGE: ${ADMIN_MAX_AGE-10} + CACHED_ASSETS_BASE_URL: + ASSETS_BASE_URL: + DEV_NETWORK_MODE: ${DEV_NETWORK_MODE} # prometheus PROMETHEUS_MULTIPROC_DIR: ${PROMETHEUS_MULTIPROC_DIR-} # uvicorn diff --git a/tools/docker-compose-dev-dataset-viewer.yml b/tools/docker-compose-dev-dataset-viewer.yml index 05d686d66c..cb8438ebff 100644 --- a/tools/docker-compose-dev-dataset-viewer.yml +++ b/tools/docker-compose-dev-dataset-viewer.yml @@ -47,6 +47,11 @@ services: ADMIN_HF_TIMEOUT_SECONDS: ${ADMIN_HF_TIMEOUT_SECONDS-10.0} ADMIN_HF_WHOAMI_PATH: ${ADMIN_HF_WHOAMI_PATH-/api/whoami-v2} ADMIN_MAX_AGE: ${ADMIN_MAX_AGE-10} + API_HF_JWT_PUBLIC_KEY_URL: ${API_HF_JWT_PUBLIC_KEY_URL} + API_HF_JWT_ADDITIONAL_PUBLIC_KEYS: ${API_HF_JWT_ADDITIONAL_PUBLIC_KEYS} + CACHED_ASSETS_BASE_URL: + ASSETS_BASE_URL: + DEV_NETWORK_MODE: ${DEV_NETWORK_MODE} # prometheus PROMETHEUS_MULTIPROC_DIR: ${PROMETHEUS_MULTIPROC_DIR-} # uvicorn