fix: warning LegacyKeyValueFormat in Dockerfile (#2314)

Signed-off-by: Viet Nguyen Duc <[email protected]>

Author: VietND96

Base/Dockerfile

@@ -5,16 +5,17 @@ LABEL authors="Selenium <[email protected]>"
 ARG VERSION
 ARG RELEASE=selenium-${VERSION}
 ARG AUTHORS=SeleniumHQ
-# Default value should be aligned with upstream Selenium (https://github.com/SeleniumHQ/selenium/blob/trunk/java/maven_deps.bzl)
-ARG OPENTELEMETRY_VERSION=1.38.0
-ARG GRPC_VERSION=1.64.0
-ARG NETTY_VERSION=4.1.108.Final
+# Default value should be aligned with upstream Selenium (https://github.com/SeleniumHQ/selenium/blob/trunk/MODULE.bazel)
+ARG OPENTELEMETRY_VERSION=1.40.0
+ARG GRPC_VERSION=1.65.1
+ARG NETTY_VERSION=4.1.111.Final
 ARG CS_VERSION=2.1.10
 
 #Arguments to define the user running Selenium
 ARG SEL_USER=seluser
 ARG SEL_GROUP=${SEL_USER}
 ARG SEL_PASSWD=secret
+ARG HOME=/home/${SEL_USER}
 ARG UID=1200
 ARG GID=1201
 ARG TZ="UTC"
@@ -30,7 +31,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
     SEL_USER=${SEL_USER} \
     SEL_UID=${UID} \
     SEL_GID=${GID} \
-    HOME=/home/${SEL_USER} \
+    HOME=${HOME} \
     TZ=${TZ} \
     SEL_DOWNLOAD_DIR=${HOME}/Downloads
 
@@ -58,18 +59,13 @@ RUN  if [ "$(dpkg --print-architecture)" = "amd64" ]; then \
     supervisor \
     gnupg2 \
     libnss3-tools \
-  && mkdir -p /etc/apt/keyrings \
-  && apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys 843C48A565F8F04B || apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 843C48A565F8F04B \
-  && wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | tee /etc/apt/keyrings/adoptium.asc >dev/null \
-  && echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list >dev/null \
-  && apt-get -qqy update \
-  && apt-get -qqy --no-install-recommends install temurin-${JRE_VERSION}-jre -y \
+    openjdk-${JRE_VERSION}-jre-headless \
   && if [ "${TARGETARCH}" = "arm" ] && [ "${TARGETVARIANT}" = "v7" ]; then \
        export ARCH=armhf ; \
     else \
        export ARCH=$(dpkg --print-architecture) ; \
     fi \
-  && sed -i 's/securerandom\.source=file:\/dev\/random/securerandom\.source=file:\/dev\/urandom/' ./usr/lib/jvm/temurin-${JRE_VERSION}-jre-${ARCH}/conf/security/java.security \
+  && sed -i 's/securerandom\.source=file:\/dev\/random/securerandom\.source=file:\/dev\/urandom/' /usr/lib/jvm/java-${JRE_VERSION}-openjdk-${ARCH}/conf/security/java.security \
   && rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
 #===================
 # Timezone settings
@@ -95,9 +91,9 @@ RUN  if [ "$(dpkg --print-architecture)" = "amd64" ]; then \
 # Selenium & relaxing permissions for OpenShift and other non-sudo environments
 #==========
   && mkdir -p /opt/selenium /opt/selenium/assets /var/run/supervisor /var/log/supervisor ${SEL_DOWNLOAD_DIR} \
-    ${HOME}/.mozilla ${HOME}/.vnc $HOME/.pki/nssdb \
+    ${HOME}/.mozilla ${HOME}/.vnc ${HOME}/.pki/nssdb \
   # NSSDB initialization with an empty password
-  && certutil -d sql:$HOME/.pki/nssdb -N --empty-password \
+  && certutil -d sql:${HOME}/.pki/nssdb -N --empty-password \
   && touch /opt/selenium/config.toml \
   && chown -R ${SEL_USER}:${SEL_GROUP} /opt/selenium /var/run/supervisor /var/log/supervisor /etc/passwd ${HOME} \
   && chmod -R 775 /opt/selenium /var/run/supervisor /var/log/supervisor /etc/passwd ${HOME} \

Distributor/Dockerfile

@@ -1,7 +1,7 @@
 ARG NAMESPACE
 ARG VERSION
-ARG AUTHORS
 FROM ${NAMESPACE}/base:${VERSION}
+ARG AUTHORS
 LABEL authors=${AUTHORS}
 
 USER ${SEL_UID}
@@ -18,10 +18,9 @@ COPY --chown="${SEL_UID}:${SEL_GID}" start-selenium-grid-distributor.sh \
 COPY selenium-grid-distributor.conf /etc/supervisor/conf.d/
 
 # In seconds, maps to "--session-request-timeout"
-ENV SE_SESSION_REQUEST_TIMEOUT 300
+ENV SE_SESSION_REQUEST_TIMEOUT=300 \
 # In seconds, maps to "--session-retry-interval"
-ENV SE_SESSION_RETRY_INTERVAL 15
+    SE_SESSION_RETRY_INTERVAL=15 \
 # In seconds, maps to "--healthcheck-interval"
-ENV SE_HEALTHCHECK_INTERVAL 120
-
-ENV SE_OTEL_SERVICE_NAME "selenium-distributor"
+    SE_HEALTHCHECK_INTERVAL=120 \
+    SE_OTEL_SERVICE_NAME="selenium-distributor"

EventBus/Dockerfile

@@ -1,7 +1,7 @@
 ARG NAMESPACE
 ARG VERSION
-ARG AUTHORS
 FROM ${NAMESPACE}/base:${VERSION}
+ARG AUTHORS
 LABEL authors=${AUTHORS}
 
 USER ${SEL_UID}
@@ -22,4 +22,4 @@ COPY --chown="${SEL_UID}:${SEL_GID}" start-selenium-grid-eventbus.sh \
 
 COPY selenium-grid-eventbus.conf /etc/supervisor/conf.d/
 
-ENV SE_OTEL_SERVICE_NAME "selenium-event-bus"
+ENV SE_OTEL_SERVICE_NAME="selenium-event-bus"

Hub/Dockerfile

@@ -1,7 +1,7 @@
 ARG NAMESPACE
 ARG VERSION
-ARG AUTHORS
 FROM ${NAMESPACE}/base:${VERSION}
+ARG AUTHORS
 LABEL authors=${AUTHORS}
 
 USER ${SEL_UID}
@@ -15,17 +15,16 @@ EXPOSE 4443
 EXPOSE 4444
 
 # In seconds, maps to "--session-request-timeout"
-ENV SE_SESSION_REQUEST_TIMEOUT 300
+ENV SE_SESSION_REQUEST_TIMEOUT=300 \
 # In seconds, maps to "--session-retry-interval"
-ENV SE_SESSION_RETRY_INTERVAL 15
+    SE_SESSION_RETRY_INTERVAL=15 \
 # In seconds, maps to "--healthcheck-interval"
-ENV SE_HEALTHCHECK_INTERVAL 120
+    SE_HEALTHCHECK_INTERVAL=120 \
 # Boolean value, maps "--relax-checks"
-ENV SE_RELAX_CHECKS true
+    SE_RELAX_CHECKS=true \
+    SE_OTEL_SERVICE_NAME="selenium-hub"
 
 COPY --chown="${SEL_UID}:${SEL_GID}" start-selenium-grid-hub.sh \
     /opt/bin/
 
 COPY selenium-grid-hub.conf /etc/supervisor/conf.d/
-
-ENV SE_OTEL_SERVICE_NAME "selenium-hub"

NodeBase/Dockerfile

@@ -1,7 +1,7 @@
 ARG NAMESPACE
 ARG VERSION
-ARG AUTHORS
 FROM ${NAMESPACE}/base:${VERSION}
+ARG AUTHORS
 LABEL authors=${AUTHORS}
 
 # Inputs: heads, tags
@@ -15,6 +15,7 @@ ARG WEBSOCKIFY_VERSION="master"
 ARG LANG_WHICH=en
 ARG LANG_WHERE=US
 ARG ENCODING=UTF-8
+ARG LANGUAGE=${LANG_WHICH}_${LANG_WHERE}.${ENCODING}
 ARG TARGETARCH
 
 USER root
@@ -25,7 +26,7 @@ USER root
 ENV LANG_WHICH=${LANG_WHICH} \
     LANG_WHERE=${LANG_WHERE} \
     ENCODING=${ENCODING} \
-    LANGUAGE=${LANG_WHICH}_${LANG_WHERE}.${ENCODING} \
+    LANGUAGE=${LANGUAGE} \
     LANG=${LANGUAGE} \
 #============================================
 # Shared cleanup script environment variables

NodeChrome/Dockerfile

@@ -1,7 +1,7 @@
 ARG NAMESPACE
 ARG VERSION
-ARG AUTHORS
 FROM ${NAMESPACE}/node-base:${VERSION}
+ARG AUTHORS
 LABEL authors=${AUTHORS}
 
 USER root
@@ -77,4 +77,4 @@ RUN echo "chrome" > /opt/selenium/browser_name
 RUN google-chrome --version | awk '{print $3}' | cut -d'.' -f1,2 > /opt/selenium/browser_version
 RUN echo "\"goog:chromeOptions\": {\"binary\": \"/usr/bin/google-chrome\"}" > /opt/selenium/browser_binary_location
 
-ENV SE_OTEL_SERVICE_NAME "selenium-node-chrome"
+ENV SE_OTEL_SERVICE_NAME="selenium-node-chrome"

NodeChromium/Dockerfile

@@ -1,7 +1,7 @@
 ARG NAMESPACE
 ARG VERSION
-ARG AUTHORS
 FROM ${NAMESPACE}/node-base:${VERSION}
+ARG AUTHORS
 LABEL authors=${AUTHORS}
 
 USER root
@@ -41,4 +41,4 @@ RUN echo "chrome" > /opt/selenium/browser_name
 RUN chromium --version | awk '{print $2}' | cut -d'.' -f1,2 > /opt/selenium/browser_version
 RUN echo "\"goog:chromeOptions\": {\"binary\": \"/usr/bin/chromium\"}" > /opt/selenium/browser_binary_location
 
-ENV SE_OTEL_SERVICE_NAME "selenium-node-chromium"
+ENV SE_OTEL_SERVICE_NAME="selenium-node-chromium"

NodeDocker/Dockerfile

@@ -1,7 +1,7 @@
 ARG NAMESPACE
 ARG VERSION
-ARG AUTHORS
 FROM ${NAMESPACE}/base:${VERSION}
+ARG AUTHORS
 LABEL authors=${AUTHORS}
 
 USER root
@@ -28,4 +28,4 @@ COPY --chown="${SEL_UID}:${SEL_GID}" start-selenium-grid-docker.sh \
 
 COPY selenium-grid-docker.conf /etc/supervisor/conf.d/
 
-ENV SE_OTEL_SERVICE_NAME "selenium-node-docker"
+ENV SE_OTEL_SERVICE_NAME="selenium-node-docker"

NodeEdge/Dockerfile

@@ -1,7 +1,7 @@
 ARG NAMESPACE
 ARG VERSION
-ARG AUTHORS
 FROM ${NAMESPACE}/node-base:${VERSION}
+ARG AUTHORS
 LABEL authors=${AUTHORS}
 
 USER root
@@ -71,4 +71,4 @@ RUN echo "MicrosoftEdge" > /opt/selenium/browser_name
 RUN microsoft-edge --version | awk '{print $3}' | cut -d'.' -f1,2 > /opt/selenium/browser_version
 RUN echo "\"ms:edgeOptions\": {\"binary\": \"/usr/bin/microsoft-edge\"}" > /opt/selenium/browser_binary_location
 
-ENV SE_OTEL_SERVICE_NAME "selenium-node-edge"
+ENV SE_OTEL_SERVICE_NAME="selenium-node-edge"

NodeFirefox/Dockerfile

@@ -1,7 +1,7 @@
 ARG NAMESPACE
 ARG VERSION
-ARG AUTHORS
 FROM ${NAMESPACE}/node-base:${VERSION}
+ARG AUTHORS
 LABEL authors=${AUTHORS}
 
 USER root
@@ -57,4 +57,4 @@ RUN echo "firefox" > /opt/selenium/browser_name
 RUN firefox --version | awk '{print $3}' > /opt/selenium/browser_version
 RUN echo "\"moz:firefoxOptions\": {\"binary\": \"/usr/bin/firefox\"}" > /opt/selenium/browser_binary_location
 
-ENV SE_OTEL_SERVICE_NAME "selenium-node-firefox"
+ENV SE_OTEL_SERVICE_NAME="selenium-node-firefox"