Sync with master

Dockerfile

@@ -112,6 +112,8 @@ RUN groupadd --system -g "${OPENCAST_GID}" "${OPENCAST_GROUP}" \
  && mkdir -p "${OPENCAST_DATA}" "${OPENCAST_UHOME}" "${WHISPER_CPP_MODELS}" \
  && chown -R "${OPENCAST_USER}:${OPENCAST_GROUP}" "${OPENCAST_DATA}" "${OPENCAST_UHOME}" "${WHISPER_CPP_MODELS}"
 
+# libgomp1 is a dependency of whisper.cpp. It is also installed as a dependency of Tesseract, but we want it to be an
+# explicitly installed package.
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \
       ca-certificates \
@@ -124,6 +126,7 @@ RUN apt-get update \
       gosu \
       inotify-tools \
       jq \
+      libgomp1 \
       netcat-openbsd \
       openssl \
       rsync \

Dockerfile-build

@@ -109,6 +109,8 @@ Pin: release o=Ubuntu
 Pin-Priority: -1
 EOF
 
+# libgomp1 is a dependency of whisper.cpp. It is also installed as a dependency of Tesseract, but we want it to be an
+# explicitly installed package.
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \
       gnupg \
@@ -140,6 +142,7 @@ RUN apt-get update \
       gosu \
       inotify-tools \
       jq \
+      libgomp1 \
       netcat-openbsd \
       openssl \
       rsync \
@@ -149,6 +152,9 @@ RUN apt-get update \
   \
  && sudo ln -s /usr/local/openjdk*/bin/* /usr/local/bin/ \
   \
+ && deluser "$(id -nu 1000)" \
+ && rm -rf /home/ubuntu \
+  \
  && groupadd --system -g "${OPENCAST_GID}" "${OPENCAST_GROUP}" \
  && useradd --system -M -N -g "${OPENCAST_GROUP}" -d "${OPENCAST_UHOME}" -u "${OPENCAST_UID}" "${OPENCAST_USER}" \
  && mkdir -p "${OPENCAST_SRC}" "${OPENCAST_HOME}" "${OPENCAST_UHOME}" "${OPENCAST_DATA}" "${OPENCAST_BUILD_ASSETS}" "${WHISPER_CPP_MODELS}" \

README.md

@@ -120,13 +120,15 @@ Usage:
 
 ## Configuration
 
-It's recommended to configure Opencast by using [Docker Volumes](https://docs.docker.com/engine/reference/run/#volume-shared-filesystems):
+It's recommended to configure Opencast by using [Docker Volumes](https://docs.docker.com/engine/containers/run/#filesystem-mounts):
 
 ```sh
 $ docker run -v "/path/to/opencast-etc:/etc/opencast" quay.io/opencast/<distribution>
 ```
 
-The most important settings, however, can be configured by [environment variables](https://docs.docker.com/engine/reference/run/#env-environment-variables). You can use this functionally to generate new configuration files. For this start a new container with specific variables and execute the `app:init` command. This will ensure you haven't missed anything, write the configuration files and exit. Then you can copy the files to a target directory:
+Note that `/path/to/opencast-etc` only needs to contain configuration files you changed. During startup, those will be complement with the additional default configuration files.
+
+The most important settings can also be configured with [environment variables](https://docs.docker.com/engine/containers/run/#environment-variables). You can use this functionally to generate new configuration files. For this, start a new container with specific variables and execute the `app:init` command. This will ensure you haven't missed anything, write the configuration files and exit. Then you can copy the files to a target directory:
 
 ```sh
 $ docker run --name opencast_generate_config \

rootfs/opencast/etc/org.opencastproject.organization-mh_default_org.cfg-clustered

@@ -112,7 +112,7 @@ prop.org.opencastproject.admin.help.documentation.url=https://docs.opencast.org
 # If the property is specified, the admin ui help menu will link to the documentation.
 # The value needs to be a URL if set.
 # Default: undefined
-prop.org.opencastproject.admin.help.restdocs.url=/rest-docs/index.html
+prop.org.opencastproject.admin.help.restdocs.url=/rest_docs.html
 
 # Link to the media module
 #

rootfs/opencast/etc/org.ops4j.pax.logging.cfg

@@ -37,7 +37,7 @@ log4j2.logger.cxf.level = WARN
 
 # Appenders configuration
 
-# Console appender used for Docker
+# Console appender used in containers
 log4j2.appender.console.type = Console
 log4j2.appender.console.name = Console
 log4j2.appender.console.layout.type = PatternLayout

rootfs/opencast/etc/org.ops4j.pax.web.cfg

@@ -51,5 +51,8 @@ org.ops4j.pax.web.ssl.key.password=password
 # Prevent cookie from being accessed by client side scripts, default false
 org.ops4j.pax.web.session.cookie.httpOnly=true
 
-# Timeout for user sessions in minutes.
-org.ops4j.pax.web.session.timeout=240
+# Timeout for user sessions in seconds
+# Note: This is seconds, not minutes due to a bug in Pax Web:
+# https://github.com/opencast/opencast/issues/6260
+# 14400 seconds = 240 minutes = 4 hours
+org.ops4j.pax.web.session.timeout=14400