@@ -33,14 +33,14 @@ ENV DEBIAN_FRONTEND=noninteractive \
3333 SEL_GID=${GID} \
3434 HOME=${HOME} \
3535 TZ=${TZ} \
36- SEL_DOWNLOAD_DIR=${HOME}/Downloads
36+ SEL_DOWNLOAD_DIR=${HOME}/Downloads \
37+ VIDEO_FOLDER="/videos"
3738
3839# ========================
3940# Miscellaneous packages
4041# Includes minimal runtime used for executing non GUI Java programs
4142# ========================
42- RUN --mount=type=secret,id=SEL_PASSWD \
43- if [ "$(dpkg --print-architecture)" = "amd64" ]; then \
43+ RUN if [ "$(dpkg --print-architecture)" = "amd64" ]; then \
4444 echo "deb http://archive.ubuntu.com/ubuntu noble main universe\n " > /etc/apt/sources.list \
4545 && echo "deb http://archive.ubuntu.com/ubuntu noble-updates main universe\n " >> /etc/apt/sources.list \
4646 && echo "deb http://security.ubuntu.com/ubuntu noble-security main universe\n " >> /etc/apt/sources.list ; \
@@ -61,8 +61,10 @@ RUN --mount=type=secret,id=SEL_PASSWD \
6161 gnupg2 \
6262 libnss3-tools \
6363 python3-pip \
64- openjdk-${JRE_VERSION}-jre-headless \
65- && if [ "${TARGETARCH}" = "arm" ] && [ "${TARGETVARIANT}" = "v7" ]; then \
64+ python3-psutil \
65+ openjdk-${JRE_VERSION}-jre-headless
66+ RUN --mount=type=secret,id=SEL_PASSWD \
67+ if [ "${TARGETARCH}" = "arm" ] && [ "${TARGETVARIANT}" = "v7" ]; then \
6668 export ARCH=armhf ; \
6769 else \
6870 export ARCH=$(dpkg --print-architecture) ; \
@@ -93,18 +95,18 @@ RUN --mount=type=secret,id=SEL_PASSWD \
9395# Selenium & relaxing permissions for OpenShift and other non-sudo environments
9496# ==========
9597 && mkdir -p /opt/selenium /opt/selenium/assets /opt/selenium/secrets /var/run/supervisor /var/log/supervisor ${SEL_DOWNLOAD_DIR} \
96- ${HOME}/.mozilla ${HOME}/.vnc ${HOME}/.pki/nssdb \
98+ ${HOME}/.mozilla ${HOME}/.vnc ${HOME}/.pki/nssdb ${VIDEO_FOLDER} \
9799 # NSSDB initialization with an empty password
98100 && certutil -d sql:${HOME}/.pki/nssdb -N --empty-password \
99101 && touch /opt/selenium/config.toml \
100- && chown -R ${SEL_USER}:${SEL_GROUP} /opt/selenium /var/run/supervisor /var/log/supervisor /etc/passwd ${HOME} \
101- && chmod -R 775 /opt/selenium /var/run/supervisor /var/log/supervisor /etc/passwd ${HOME} \
102+ && chown -R ${SEL_USER}:${SEL_GROUP} /opt/selenium /var/run/supervisor /var/log/supervisor /etc/passwd ${HOME} ${VIDEO_FOLDER} \
103+ && chmod -R 775 /opt/selenium /var/run/supervisor /var/log/supervisor /etc/passwd ${HOME} ${VIDEO_FOLDER} \
102104 && wget --no-verbose https://github.com/${AUTHORS}/selenium/releases/download/${RELEASE}/selenium-server-${VERSION}.jar \
103105 -O /opt/selenium/selenium-server.jar \
104- && chgrp -R 0 /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
105- && chmod -R g=u /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
106- && setfacl -Rm u:${SEL_USER}:rwx /opt /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
107- && setfacl -Rm g:${SEL_GROUP}:rwx /opt /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
106+ && chgrp -R 0 /opt/selenium ${HOME} ${VIDEO_FOLDER} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
107+ && chmod -R g=u /opt/selenium ${HOME} ${VIDEO_FOLDER} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
108+ && setfacl -Rm u:${SEL_USER}:rwx /opt /opt/selenium ${HOME} ${VIDEO_FOLDER} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
109+ && setfacl -Rm g:${SEL_GROUP}:rwx /opt /opt/selenium ${HOME} ${VIDEO_FOLDER} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
108110# =====
109111# Download observability related OpenTelemetry jars and make them available in a separate directory
110112# so that the container can skip downloading them everytime it comes up
0 commit comments