From 454413eaaac70b744715e562690462a891e9a6ab Mon Sep 17 00:00:00 2001 From: Viet Nguyen Duc Date: Mon, 30 Jun 2025 08:44:08 +0700 Subject: [PATCH] Docker: Add Node config env var `SE_NODE_DELETE_SESSION_ON_UI` Signed-off-by: Viet Nguyen Duc --- ENV_VARIABLES.md | 5 +++-- NodeBase/Dockerfile | 1 + NodeBase/start-selenium-node.sh | 4 ++++ Standalone/start-selenium-standalone.sh | 4 ++++ scripts/generate_list_env_vars/description.yaml | 6 +++++- scripts/generate_list_env_vars/value.yaml | 4 +++- 6 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ENV_VARIABLES.md b/ENV_VARIABLES.md index e7e99d2989..19ef488f10 100644 --- a/ENV_VARIABLES.md +++ b/ENV_VARIABLES.md @@ -53,7 +53,7 @@ | SE_HTTPS_PRIVATE_KEY | /opt/selenium/secrets/tls.key | | --https-private-key | | SE_ENABLE_TRACING | true | | --tracing | | SE_OTEL_EXPORTER_ENDPOINT | | | -Dotel.exporter.otlp.endpoint= | -| SE_OTEL_SERVICE_NAME | selenium-event-bus | | -Dotel.resource.attributes=service.name= | +| SE_OTEL_SERVICE_NAME | selenium-router | | -Dotel.resource.attributes=service.name= | | SE_OTEL_JVM_ARGS | | | | | SE_OTEL_TRACES_EXPORTER | otlp | | -Dotel.traces.exporter | | SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED | true | | | @@ -75,7 +75,7 @@ | SE_EVENT_BUS_PUBLISH_PORT | 4442 | | | | SE_EVENT_BUS_SUBSCRIBE_PORT | 4443 | | | | SE_NODE_SESSION_TIMEOUT | 300 | | --session-timeout | -| SE_NODE_ENABLE_MANAGED_DOWNLOADS | true | | --enable-managed-downloads | +| SE_NODE_ENABLE_MANAGED_DOWNLOADS | true | This causes the Node to auto manage files downloaded for a given session on the Node | --enable-managed-downloads | | SE_NODE_ENABLE_CDP | | | --enable-cdp | | SE_NODE_REGISTER_PERIOD | 120 | | --register-period | | SE_NODE_REGISTER_CYCLE | 10 | | --register-cycle | @@ -152,3 +152,4 @@ | SE_VIDEO_BUFSIZE | | | | | SE_VIDEO_CRF | | | | | SE_VIDEO_MAXRATE | | | | +| SE_NODE_DELETE_SESSION_ON_UI | true | Enable capability to support deleting session on Grid UI | --delete-session-on-ui | diff --git a/NodeBase/Dockerfile b/NodeBase/Dockerfile index c83e27f126..a1e7c611cd 100644 --- a/NodeBase/Dockerfile +++ b/NodeBase/Dockerfile @@ -56,6 +56,7 @@ ENV LANG_WHICH=${LANG_WHICH} \ SE_OFFLINE="true" \ SE_NODE_BROWSER_VERSION="stable" \ SE_NODE_PLATFORM_NAME="Linux" \ + SE_NODE_DELETE_SESSION_ON_UI="true" \ #============================ # Some configuration options #============================ diff --git a/NodeBase/start-selenium-node.sh b/NodeBase/start-selenium-node.sh index f57a2ce2f0..4ac805f411 100755 --- a/NodeBase/start-selenium-node.sh +++ b/NodeBase/start-selenium-node.sh @@ -73,6 +73,10 @@ if [ "$SE_NODE_REGISTER_SHUTDOWN_ON_FAILURE" = "true" ]; then append_se_opts "--register-shutdown-on-failure" fi +if [ "$SE_NODE_DELETE_SESSION_ON_UI" = "true" ]; then + append_se_opts "--delete-session-on-ui" "true" +fi + if [ ! -z "$SE_NODE_HEARTBEAT_PERIOD" ]; then append_se_opts "--heartbeat-period" "${SE_NODE_HEARTBEAT_PERIOD}" fi diff --git a/Standalone/start-selenium-standalone.sh b/Standalone/start-selenium-standalone.sh index 72584c54d9..dd8daf95fd 100755 --- a/Standalone/start-selenium-standalone.sh +++ b/Standalone/start-selenium-standalone.sh @@ -72,6 +72,10 @@ if [ ! -z "$SE_NODE_HEARTBEAT_PERIOD" ]; then append_se_opts "--heartbeat-period" "${SE_NODE_HEARTBEAT_PERIOD}" fi +if [ "$SE_NODE_DELETE_SESSION_ON_UI" = "true" ]; then + append_se_opts "--delete-session-on-ui" "true" +fi + if [ ! -z "$SE_LOG_LEVEL" ]; then append_se_opts "--log-level" "${SE_LOG_LEVEL}" fi diff --git a/scripts/generate_list_env_vars/description.yaml b/scripts/generate_list_env_vars/description.yaml index e938a8e19f..61a3c15758 100644 --- a/scripts/generate_list_env_vars/description.yaml +++ b/scripts/generate_list_env_vars/description.yaml @@ -228,7 +228,8 @@ description: '' cli: --session-timeout - name: SE_NODE_ENABLE_MANAGED_DOWNLOADS - description: '' + description: This causes the Node to auto manage files downloaded for a given session + on the Node cli: --enable-managed-downloads - name: SE_NODE_ENABLE_CDP description: '' @@ -464,3 +465,6 @@ - name: SE_VIDEO_MAXRATE description: '' cli: '' +- name: SE_NODE_DELETE_SESSION_ON_UI + description: Enable capability to support deleting session on Grid UI + cli: --delete-session-on-ui diff --git a/scripts/generate_list_env_vars/value.yaml b/scripts/generate_list_env_vars/value.yaml index 87c083de10..b3887cb11a 100644 --- a/scripts/generate_list_env_vars/value.yaml +++ b/scripts/generate_list_env_vars/value.yaml @@ -86,6 +86,8 @@ default: '10' - name: SE_NODE_CONTAINER_NAME default: '' +- name: SE_NODE_DELETE_SESSION_ON_UI + default: 'true' - name: SE_NODE_DOCKER_CONFIG_FILENAME default: docker.toml - name: SE_NODE_ENABLE_CDP @@ -161,7 +163,7 @@ - name: SE_OTEL_RESOURCE_ATTRIBUTES default: '' - name: SE_OTEL_SERVICE_NAME - default: selenium-event-bus + default: selenium-router - name: SE_OTEL_TRACES_EXPORTER default: otlp - name: SE_PRESET