bento-platform · davidlougheed · Aug 18, 2026
diff --git a/etc/bento.env b/etc/bento.env
@@ -9,13 +9,13 @@
 
 BENTOV2_PUBLIC_URL=https://${BENTOV2_DOMAIN}
 BENTOV2_PUBLIC_URL_TRAILING_SLASH=${BENTOV2_PUBLIC_URL}/
-BENTOV2_PORTAL_PUBLIC_URL=https://${BENTOV2_PORTAL_DOMAIN}
-BENTOV2_PORTAL_PUBLIC_URL_TRAILING_SLASH=${BENTOV2_PORTAL_PUBLIC_URL}/
+BENTO_ADMIN_PUBLIC_URL=https://${BENTOV2_PORTAL_DOMAIN}
+BENTO_ADMIN_PUBLIC_URL_TRAILING_SLASH=${BENTO_ADMIN_PUBLIC_URL}/
 BENTOV2_AUTH_PUBLIC_URL=https://${BENTOV2_AUTH_DOMAIN}
 BENTO_CBIOPORTAL_PUBLIC_URL=https://${BENTOV2_CBIOPORTAL_DOMAIN}
 BENTO_AUTHZ_SERVICE_URL=${BENTOV2_PUBLIC_URL}/api/authorization/
 
-BENTO_CORS_ORIGINS="${BENTOV2_PUBLIC_URL};${BENTOV2_PORTAL_PUBLIC_URL}"
+BENTO_CORS_ORIGINS="${BENTOV2_PUBLIC_URL};${BENTO_ADMIN_PUBLIC_URL}"
 
 BENTO_HEALTHCHECK_TIMEOUT=5s
 BENTO_HEALTHCHECK_INTERVAL=5m
@@ -130,7 +130,7 @@ BENTOV2_DROP_BOX_CPUS=3
 
 # Service Registry
 BENTOV2_SERVICE_REGISTRY_IMAGE=ghcr.io/bento-platform/bento_service_registry
-BENTOV2_SERVICE_REGISTRY_VERSION=1.5.8
+BENTOV2_SERVICE_REGISTRY_VERSION=edge
 BENTOV2_SERVICE_REGISTRY_VERSION_DEV=${BENTOV2_SERVICE_REGISTRY_VERSION}-dev
 BENTOV2_SERVICE_REGISTRY_CONTAINER_NAME=${BENTOV2_PREFIX}-service-registry
 BENTO_SERVICE_REGISTRY_NETWORK=${BENTOV2_PREFIX}-service-registry-net
@@ -351,7 +351,7 @@ BENTOV2_GOHAN_API_AUTHZ_REQHEADS=X-CUSTOM-1,X-CUSTOM-2
 
 # Canonical/world-resolvable URL for Gohan
 #  - TODO: services should use the service registry instead
-BENTO_GOHAN_URL=${BENTOV2_PORTAL_PUBLIC_URL}/api/gohan
+BENTO_GOHAN_URL=${BENTO_ADMIN_PUBLIC_URL}/api/gohan
 
 # -- Elasticsearch
 BENTOV2_GOHAN_ES_USERNAME=elastic
@@ -395,7 +395,7 @@ BENTO_PUBLIC_SERVICE_ID=${BENTOV2_PREFIX}-public
 BENTO_PUBLIC_CLIENT_NAME=BentoPublicDev
 BENTO_PUBLIC_WES_URL=http://${BENTOV2_WES_CONTAINER_NAME}:${BENTOV2_WES_INTERNAL_PORT}
 BENTO_PUBLIC_GOHAN_URL=http://${BENTOV2_GOHAN_API_CONTAINER_NAME}:${BENTOV2_GOHAN_API_INTERNAL_PORT}
-BENTO_PUBLIC_ADMIN_URL=${BENTOV2_PORTAL_PUBLIC_URL}
+BENTO_PUBLIC_ADMIN_URL=${BENTO_ADMIN_PUBLIC_URL}
 # BENTO_PUBLIC_TRANSLATED is set in default_config.env and can be overwritten in local.env
 
 # Beacon
@@ -451,8 +451,8 @@ BENTO_CBIOPORTAL_SESSION_DATABASE_DATA_DIR=${BENTO_FAST_DATA_DIR}/cbioportal/ses
 
 # Monitoring
 BENTO_MONITORING_NETWORK=${BENTOV2_PREFIX}-monitoring-net
-BENTO_PRIVATE_GRAFANA_URL=${BENTOV2_PORTAL_PUBLIC_URL}/api/grafana
-BENTO_PUBLIC_GRAFANA_URL=${BENTOV2_PORTAL_PUBLIC_URL}/grafana
+BENTO_PRIVATE_GRAFANA_URL=${BENTO_ADMIN_PUBLIC_URL}/api/grafana
+BENTO_PUBLIC_GRAFANA_URL=${BENTO_ADMIN_PUBLIC_URL}/grafana
 BENTO_LOKI_IMAGE=grafana/loki
 BENTO_LOKI_IMAGE_VERSION=3.6.12
 BENTO_LOKI_CONTAINER_NAME=${BENTOV2_PREFIX}-loki

diff --git a/etc/bento_services.json b/etc/bento_services.json
@@ -46,12 +46,12 @@
   },
   "gohan-api": {
     "service_kind": "gohan",
-    "url_template": "{BENTO_PORTAL_PUBLIC_URL}/api/{service_kind}",
+    "url_template": "{BENTO_ADMIN_PUBLIC_URL}/api/{service_kind}",
     "repository": "git@github.com:bento-platform/gohan.git"
   },
   "web": {
     "service_kind": "web",
-    "url_template": "{BENTO_PORTAL_PUBLIC_URL}",
+    "url_template": "{BENTO_ADMIN_PUBLIC_URL}",
     "repository": "git@github.com:bento-platform/bento_web.git"
   },
   "authz": {

diff --git a/etc/tests/integration/conftest.py b/etc/tests/integration/conftest.py
@@ -51,7 +51,7 @@ def setup(request):
     else:
         driver=None
 
-    bentov2_url= os.environ["BENTOV2_PORTAL_PUBLIC_URL"]
+    bentov2_url= os.environ["BENTO_ADMIN_PUBLIC_URL"]
     bentov2auth_url= os.environ["BENTOV2_AUTH_PUBLIC_URL"]
     bentov2_public_url= os.environ["BENTOV2_PUBLIC_URL"]
 

diff --git a/lib/event-relay/docker-compose.event-relay.yaml b/lib/event-relay/docker-compose.event-relay.yaml
@@ -23,7 +23,7 @@ services:
       - SOCKET_IO_PATH=${BENTOV2_EVENT_RELAY_SOCKET_IO_PATH}
 
       # CORS origins for connecting to the socket
-      - CORS_ORIGINS=${BENTOV2_PUBLIC_URL};${BENTOV2_PORTAL_PUBLIC_URL}
+      - CORS_ORIGINS=${BENTOV2_PUBLIC_URL};${BENTO_ADMIN_PUBLIC_URL}
 
       # Connection string (URL or path to UNIX socket file) for the Redis instance.
       - REDIS_CONNECTION=redis://${BENTOV2_REDIS_CONTAINER_NAME}:${BENTOV2_REDIS_INTERNAL_PORT}

diff --git a/lib/katsu/docker-compose.katsu.yaml b/lib/katsu/docker-compose.katsu.yaml
@@ -14,7 +14,7 @@ services:
         condition: service_healthy
     environment:
       - BENTO_UID
-      - CHORD_URL=${BENTOV2_PORTAL_PUBLIC_URL}
+      - CHORD_URL=${BENTO_ADMIN_PUBLIC_URL}
       - CHORD_DEBUG=False
       - CHORD_METADATA_SUB_PATH
       - INTERNAL_PORT=${BENTOV2_KATSU_INTERNAL_PORT}

diff --git a/lib/notification/docker-compose.notification.yaml b/lib/notification/docker-compose.notification.yaml
@@ -11,7 +11,7 @@ services:
       - REDIS_PORT=${BENTOV2_REDIS_INTERNAL_PORT}
       - INTERNAL_PORT=${BENTOV2_NOTIFICATION_INTERNAL_PORT}
       - BENTO_AUTHZ_SERVICE_URL
-      - CORS_ORIGINS=${BENTOV2_PUBLIC_URL};${BENTOV2_PORTAL_PUBLIC_URL}
+      - CORS_ORIGINS=${BENTOV2_PUBLIC_URL};${BENTO_ADMIN_PUBLIC_URL}
     networks:
       - notification-net
       - redis-net  # For event pub/sub

diff --git a/lib/service-registry/docker-compose.service-registry.yaml b/lib/service-registry/docker-compose.service-registry.yaml
@@ -11,12 +11,9 @@ services:
       # registry instance.
       - BENTO_SERVICES=/bento_services.json
 
-      # Common URL base for all services
-      - BENTO_URL=${BENTOV2_PORTAL_PUBLIC_URL}
-
       # Variables for generating service URLs from URL templates found in bento_services.json
       - BENTO_PUBLIC_URL=${BENTOV2_PUBLIC_URL}
-      - BENTO_PORTAL_PUBLIC_URL=${BENTOV2_PORTAL_PUBLIC_URL}
+      - BENTO_ADMIN_PUBLIC_URL
 
       - BENTO_DEBUG=False
       - BENTO_VALIDATE_SSL=True

diff --git a/lib/web/docker-compose.web.yaml b/lib/web/docker-compose.web.yaml
@@ -11,7 +11,7 @@ services:
       - BENTO_CBIOPORTAL_ENABLED
       - BENTO_MONITORING_ENABLED
       - BENTO_CBIOPORTAL_PUBLIC_URL
-      - BENTO_URL=${BENTOV2_PORTAL_PUBLIC_URL}
+      - BENTO_URL=${BENTO_ADMIN_PUBLIC_URL}
       - BENTO_PUBLIC_URL=${BENTOV2_PUBLIC_URL}
       - CUSTOM_HEADER=${BENTO_WEB_CUSTOM_HEADER}
       - OPENID_CONFIG_URL=${BENTOV2_AUTH_PUBLIC_URL}${BENTOV2_AUTH_WELLKNOWN_PATH}

diff --git a/lib/wes/docker-compose.wes.yaml b/lib/wes/docker-compose.wes.yaml
@@ -6,7 +6,7 @@ services:
     environment:
       - BENTO_UID
 
-      - BENTO_URL=${BENTOV2_PORTAL_PUBLIC_URL_TRAILING_SLASH}
+      - BENTO_URL=${BENTO_ADMIN_PUBLIC_URL_TRAILING_SLASH}
 
       - CELERY_RESULT_BACKEND=redis://${BENTOV2_REDIS_CONTAINER_NAME}:${BENTOV2_REDIS_INTERNAL_PORT}
       - CELERY_BROKER_URL=redis://${BENTOV2_REDIS_CONTAINER_NAME}:${BENTOV2_REDIS_INTERNAL_PORT}

diff --git a/py_bentoctl/auth_helper.py b/py_bentoctl/auth_helper.py
@@ -26,7 +26,7 @@
 CLIENT_ID = os.getenv("BENTOV2_AUTH_CLIENT_ID")
 
 PUBLIC_URL = os.getenv("BENTOV2_PUBLIC_URL")
-PORTAL_PUBLIC_URL = os.getenv("BENTOV2_PORTAL_PUBLIC_URL")
+PORTAL_PUBLIC_URL = os.getenv("BENTO_ADMIN_PUBLIC_URL")
 CBIOPORTAL_URL = os.getenv("BENTO_CBIOPORTAL_PUBLIC_URL")
 
 GATEWAY_CONTAINER_NAME = os.getenv("BENTOV2_GATEWAY_CONTAINER_NAME")