Update Opencast to v17.0

opencast · Dec 5, 2024 · 8f0e377 · 8f0e377
1 parent 5d4b265
commit 8f0e377
Show file tree

Hide file tree

Showing 20 changed files with 110 additions and 239 deletions.
diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
@@ -27,24 +27,24 @@ jobs:
             opencast_version: 'master'
             push_major: 'false'
           - day_of_week: '1'
-            opencast_version: '16.7'
+            opencast_version: '17.0'
             push_major: 'true'
           - day_of_week: '2'
-            opencast_version: '16.6'
+            opencast_version: '17.0'
             push_major: 'false'
           - day_of_week: '3'
-            opencast_version: '16.5'
+            opencast_version: '17.0'
             push_major: 'false'
 
           # legacy
           - day_of_week: '4'
-            opencast_version: '15.12'
+            opencast_version: '16.7'
             push_major: 'true'
           - day_of_week: '5'
-            opencast_version: '15.11'
+            opencast_version: '16.6'
             push_major: 'false'
           - day_of_week: '6'
-            opencast_version: '15.10'
+            opencast_version: '16.5'
             push_major: 'false'
 
     steps:

diff --git a/Dockerfile b/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 \

diff --git a/Dockerfile-build b/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}" \

diff --git a/README.md b/README.md
@@ -78,7 +78,7 @@ In the `./docker-compose` directory there are also compose files for more produc
 
 ## Images
 
-Opencast comes in different distributions. For each of the official distributions, there is a specific container image. Each version is tagged. For example, the full image name containing the `admin` distribution at version `16.7` is `quay.io/opencast/admin:16.7`. Leaving the version out will install the latest one.
+Opencast comes in different distributions. For each of the official distributions, there is a specific container image. Each version is tagged. For example, the full image name containing the `admin` distribution at version `17.0` is `quay.io/opencast/admin:17.0`. Leaving the version out will install the latest one.
 
 ### `allinone`
 
@@ -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 \

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-16.7
+17.0
diff --git a/VERSION_FFMPEG b/VERSION_FFMPEG
@@ -1 +1 @@
-7.0.1
+7.0.2
diff --git a/VERSION_MAJOR b/VERSION_MAJOR
@@ -1 +1 @@
-16
+17
diff --git a/VERSION_OPENCAST b/VERSION_OPENCAST
@@ -1 +1 @@
-16.7
+17.0
diff --git a/VERSION_WHISPER_CPP b/VERSION_WHISPER_CPP
@@ -1 +1 @@
-v1.6.2
+v1.7.2
diff --git a/docker-compose/docker-compose.allinone.h2+pyca.yml b/docker-compose/docker-compose.allinone.h2+pyca.yml
@@ -19,7 +19,11 @@ volumes:
 
 services:
   opensearch:
-    image: opensearchproject/opensearch:1
+    image: opencast/opensearch:1
+    build:
+      dockerfile_inline: |
+        FROM docker.io/opensearchproject/opensearch:1
+        RUN bin/opensearch-plugin install analysis-icu
     environment:
       discovery.type: single-node
       bootstrap.memory_lock: 'true'
@@ -30,7 +34,7 @@ services:
       - opensearch:/usr/share/opensearch/data
 
   opencast:
-    image: quay.io/opencast/allinone:16.7
+    image: quay.io/opencast/allinone:17.0
     environment:
       ORG_OPENCASTPROJECT_SERVER_URL: http://opencast:8080
       ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8080/static

diff --git a/docker-compose/docker-compose.allinone.h2.yml b/docker-compose/docker-compose.allinone.h2.yml
@@ -18,7 +18,11 @@ volumes:
 
 services:
   opensearch:
-    image: opensearchproject/opensearch:1
+    image: opencast/opensearch:1
+    build:
+      dockerfile_inline: |
+        FROM docker.io/opensearchproject/opensearch:1
+        RUN bin/opensearch-plugin install analysis-icu
     environment:
       discovery.type: single-node
       bootstrap.memory_lock: 'true'
@@ -29,7 +33,7 @@ services:
       - opensearch:/usr/share/opensearch/data
 
   opencast:
-    image: quay.io/opencast/allinone:16.7
+    image: quay.io/opencast/allinone:17.0
     environment:
       ORG_OPENCASTPROJECT_SERVER_URL: http://localhost:8080
       ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8080/static

diff --git a/docker-compose/docker-compose.allinone.mariadb.yml b/docker-compose/docker-compose.allinone.mariadb.yml
@@ -19,7 +19,7 @@ volumes:
 
 services:
   mariadb:
-    image: mariadb:10.5
+    image: docker.io/library/mariadb:10.5
     environment:
       MYSQL_ROOT_PASSWORD: root
       MYSQL_DATABASE: opencast
@@ -30,7 +30,11 @@ services:
       - db:/var/lib/mysql
 
   opensearch:
-    image: opensearchproject/opensearch:1
+    image: opencast/opensearch:1
+    build:
+      dockerfile_inline: |
+        FROM docker.io/opensearchproject/opensearch:1
+        RUN bin/opensearch-plugin install analysis-icu
     environment:
       discovery.type: single-node
       bootstrap.memory_lock: 'true'
@@ -41,7 +45,7 @@ services:
       - opensearch:/usr/share/opensearch/data
 
   opencast:
-    image: quay.io/opencast/allinone:16.7
+    image: quay.io/opencast/allinone:17.0
     environment:
       ORG_OPENCASTPROJECT_SERVER_URL: http://localhost:8080
       ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8080/static

diff --git a/docker-compose/docker-compose.allinone.postgres.yml b/docker-compose/docker-compose.allinone.postgres.yml
@@ -19,7 +19,7 @@ volumes:
 
 services:
   postgresql:
-    image: postgres:13-alpine
+    image: docker.io/library/postgres:13-alpine
     environment:
       POSTGRES_DB: opencast
       POSTGRES_USER: opencast
@@ -28,7 +28,11 @@ services:
       - db:/var/lib/postgresql/data
 
   opensearch:
-    image: opensearchproject/opensearch:1
+    image: opencast/opensearch:1
+    build:
+      dockerfile_inline: |
+        FROM docker.io/opensearchproject/opensearch:1
+        RUN bin/opensearch-plugin install analysis-icu
     environment:
       discovery.type: single-node
       bootstrap.memory_lock: 'true'
@@ -39,7 +43,7 @@ services:
       - opensearch:/usr/share/opensearch/data
 
   opencast:
-    image: quay.io/opencast/allinone:16.7
+    image: quay.io/opencast/allinone:17.0
     environment:
       ORG_OPENCASTPROJECT_SERVER_URL: http://localhost:8080
       ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8080/static

diff --git a/docker-compose/docker-compose.build.yml b/docker-compose/docker-compose.build.yml
@@ -18,7 +18,11 @@ volumes:
 
 services:
   opensearch:
-    image: opensearchproject/opensearch:1
+    image: opencast/opensearch:1
+    build:
+      dockerfile_inline: |
+        FROM docker.io/opensearchproject/opensearch:1
+        RUN bin/opensearch-plugin install analysis-icu
     environment:
       discovery.type: single-node
       bootstrap.memory_lock: 'true'
@@ -29,7 +33,7 @@ services:
       - opensearch:/usr/share/opensearch/data
 
   opencast:
-    image: quay.io/opencast/build:16.7
+    image: quay.io/opencast/build:17.0
     tty: true
     stdin_open: true
     environment:

diff --git a/docker-compose/docker-compose.multiserver.build.yml b/docker-compose/docker-compose.multiserver.build.yml
@@ -19,7 +19,7 @@ volumes:
 
 services:
   mariadb:
-    image: mariadb:10.5
+    image: docker.io/library/mariadb:10.5
     environment:
       MYSQL_ROOT_PASSWORD: root
       MYSQL_DATABASE: opencast
@@ -30,7 +30,11 @@ services:
       - db:/var/lib/mysql
 
   opensearch:
-    image: opensearchproject/opensearch:1
+    image: opencast/opensearch:1
+    build:
+      dockerfile_inline: |
+        FROM docker.io/opensearchproject/opensearch:1
+        RUN bin/opensearch-plugin install analysis-icu
     environment:
       discovery.type: single-node
       bootstrap.memory_lock: 'true'
@@ -41,7 +45,7 @@ services:
       - opensearch:/usr/share/opensearch/data
 
   opencast-admin:
-    image: quay.io/opencast/build:16.7
+    image: quay.io/opencast/build:17.0
     tty: true
     stdin_open: true
     environment:
@@ -69,7 +73,7 @@ services:
       - "${OPENCAST_SRC}:/usr/src/opencast"
 
   opencast-presentation:
-    image: quay.io/opencast/build:16.7
+    image: quay.io/opencast/build:17.0
     tty: true
     stdin_open: true
     environment:
@@ -96,7 +100,7 @@ services:
       - "${OPENCAST_SRC}:/usr/src/opencast"
 
   opencast-worker:
-    image: quay.io/opencast/build:16.7
+    image: quay.io/opencast/build:17.0
     tty: true
     stdin_open: true
     environment:

diff --git a/docker-compose/docker-compose.multiserver.mariadb.yml b/docker-compose/docker-compose.multiserver.mariadb.yml
@@ -19,7 +19,7 @@ volumes:
 
 services:
   mariadb:
-    image: mariadb:10.5
+    image: docker.io/library/mariadb:10.5
     environment:
       MYSQL_ROOT_PASSWORD: root
       MYSQL_DATABASE: opencast
@@ -30,7 +30,11 @@ services:
       - db:/var/lib/mysql
 
   opensearch:
-    image: opensearchproject/opensearch:1
+    image: opencast/opensearch:1
+    build:
+      dockerfile_inline: |
+        FROM docker.io/opensearchproject/opensearch:1
+        RUN bin/opensearch-plugin install analysis-icu
     environment:
       discovery.type: single-node
       bootstrap.memory_lock: 'true'
@@ -41,7 +45,7 @@ services:
       - opensearch:/usr/share/opensearch/data
 
   opencast-admin:
-    image: quay.io/opencast/admin:16.7
+    image: quay.io/opencast/admin:17.0
     environment:
       ORG_OPENCASTPROJECT_SERVER_URL: http://opencast-admin:8080
       ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8081/static
@@ -62,7 +66,7 @@ services:
       - data:/data
 
   opencast-presentation:
-    image: quay.io/opencast/presentation:16.7
+    image: quay.io/opencast/presentation:17.0
     environment:
       ORG_OPENCASTPROJECT_SERVER_URL: http://opencast-presentation:8080
       ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8081/static
@@ -82,7 +86,7 @@ services:
       - data:/data
 
   opencast-worker:
-    image: quay.io/opencast/worker:16.7
+    image: quay.io/opencast/worker:17.0
     environment:
       ORG_OPENCASTPROJECT_SERVER_URL: http://opencast-worker:8080
       ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8081/static

diff --git a/docker-compose/docker-compose.multiserver.postgres.yml b/docker-compose/docker-compose.multiserver.postgres.yml
@@ -19,7 +19,7 @@ volumes:
 
 services:
   postgresql:
-    image: postgres:13-alpine
+    image: docker.io/library/postgres:13-alpine
     environment:
       POSTGRES_DB: opencast
       POSTGRES_USER: opencast
@@ -28,7 +28,11 @@ services:
       - db:/var/lib/postgresql/data
 
   opensearch:
-    image: opensearchproject/opensearch:1
+    image: opencast/opensearch:1
+    build:
+      dockerfile_inline: |
+        FROM docker.io/opensearchproject/opensearch:1
+        RUN bin/opensearch-plugin install analysis-icu
     environment:
       discovery.type: single-node
       bootstrap.memory_lock: 'true'
@@ -39,7 +43,7 @@ services:
       - opensearch:/usr/share/opensearch/data
 
   opencast-admin:
-    image: quay.io/opencast/admin:16.7
+    image: quay.io/opencast/admin:17.0
     environment:
       ORG_OPENCASTPROJECT_SERVER_URL: http://opencast-admin:8080
       ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8081/static
@@ -60,7 +64,7 @@ services:
       - data:/data
 
   opencast-presentation:
-    image: quay.io/opencast/presentation:16.7
+    image: quay.io/opencast/presentation:17.0
     environment:
       ORG_OPENCASTPROJECT_SERVER_URL: http://opencast-presentation:8080
       ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8081/static
@@ -80,7 +84,7 @@ services:
       - data:/data
 
   opencast-worker:
-    image: quay.io/opencast/worker:16.7
+    image: quay.io/opencast/worker:17.0
     environment:
       ORG_OPENCASTPROJECT_SERVER_URL: http://opencast-worker:8080
       ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8081/static