From 5d4b26583c3601647a5e74e14863f09a13ab2c6a Mon Sep 17 00:00:00 2001 From: Matthias Neugebauer Date: Thu, 21 Nov 2024 11:30:26 +0100 Subject: [PATCH] Update Opencast to v16.7 --- .github/workflows/cron.yml | 12 ++++++------ README.md | 2 +- VERSION | 2 +- VERSION_OPENCAST | 2 +- docker-compose/docker-compose.allinone.h2+pyca.yml | 2 +- docker-compose/docker-compose.allinone.h2.yml | 2 +- docker-compose/docker-compose.allinone.mariadb.yml | 2 +- docker-compose/docker-compose.allinone.postgres.yml | 2 +- docker-compose/docker-compose.build.yml | 2 +- docker-compose/docker-compose.multiserver.build.yml | 6 +++--- .../docker-compose.multiserver.mariadb.yml | 6 +++--- .../docker-compose.multiserver.postgres.yml | 6 +++--- rootfs/opencast/etc/org.ops4j.pax.web.cfg | 7 +++++-- 13 files changed, 28 insertions(+), 25 deletions(-) diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml index b4cd939..70e5dac 100644 --- 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.6' + opencast_version: '16.7' push_major: 'true' - day_of_week: '2' - opencast_version: '16.5' + opencast_version: '16.6' push_major: 'false' - day_of_week: '3' - opencast_version: '16.4' + opencast_version: '16.5' push_major: 'false' # legacy - day_of_week: '4' - opencast_version: '15.11' + opencast_version: '15.12' push_major: 'true' - day_of_week: '5' - opencast_version: '15.10' + opencast_version: '15.11' push_major: 'false' - day_of_week: '6' - opencast_version: '15.9' + opencast_version: '15.10' push_major: 'false' steps: diff --git a/README.md b/README.md index 0fa1f88..69083b0 100644 --- 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.6` is `quay.io/opencast/admin:16.6`. 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 `16.7` is `quay.io/opencast/admin:16.7`. Leaving the version out will install the latest one. ### `allinone` diff --git a/VERSION b/VERSION index d925544..270c4d9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.6 +16.7 diff --git a/VERSION_OPENCAST b/VERSION_OPENCAST index d925544..270c4d9 100644 --- a/VERSION_OPENCAST +++ b/VERSION_OPENCAST @@ -1 +1 @@ -16.6 +16.7 diff --git a/docker-compose/docker-compose.allinone.h2+pyca.yml b/docker-compose/docker-compose.allinone.h2+pyca.yml index c33b65d..5b0c819 100644 --- a/docker-compose/docker-compose.allinone.h2+pyca.yml +++ b/docker-compose/docker-compose.allinone.h2+pyca.yml @@ -30,7 +30,7 @@ services: - opensearch:/usr/share/opensearch/data opencast: - image: quay.io/opencast/allinone:16.6 + image: quay.io/opencast/allinone:16.7 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 index ce03bab..dd1f047 100644 --- a/docker-compose/docker-compose.allinone.h2.yml +++ b/docker-compose/docker-compose.allinone.h2.yml @@ -29,7 +29,7 @@ services: - opensearch:/usr/share/opensearch/data opencast: - image: quay.io/opencast/allinone:16.6 + image: quay.io/opencast/allinone:16.7 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 index d13a7ab..897dd3c 100644 --- a/docker-compose/docker-compose.allinone.mariadb.yml +++ b/docker-compose/docker-compose.allinone.mariadb.yml @@ -41,7 +41,7 @@ services: - opensearch:/usr/share/opensearch/data opencast: - image: quay.io/opencast/allinone:16.6 + image: quay.io/opencast/allinone:16.7 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 index 9f923ca..7f4a676 100644 --- a/docker-compose/docker-compose.allinone.postgres.yml +++ b/docker-compose/docker-compose.allinone.postgres.yml @@ -39,7 +39,7 @@ services: - opensearch:/usr/share/opensearch/data opencast: - image: quay.io/opencast/allinone:16.6 + image: quay.io/opencast/allinone:16.7 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 index 3e5430a..8548c2e 100644 --- a/docker-compose/docker-compose.build.yml +++ b/docker-compose/docker-compose.build.yml @@ -29,7 +29,7 @@ services: - opensearch:/usr/share/opensearch/data opencast: - image: quay.io/opencast/build:16.6 + image: quay.io/opencast/build:16.7 tty: true stdin_open: true environment: diff --git a/docker-compose/docker-compose.multiserver.build.yml b/docker-compose/docker-compose.multiserver.build.yml index 08ee439..48ddca9 100644 --- a/docker-compose/docker-compose.multiserver.build.yml +++ b/docker-compose/docker-compose.multiserver.build.yml @@ -41,7 +41,7 @@ services: - opensearch:/usr/share/opensearch/data opencast-admin: - image: quay.io/opencast/build:16.6 + image: quay.io/opencast/build:16.7 tty: true stdin_open: true environment: @@ -69,7 +69,7 @@ services: - "${OPENCAST_SRC}:/usr/src/opencast" opencast-presentation: - image: quay.io/opencast/build:16.6 + image: quay.io/opencast/build:16.7 tty: true stdin_open: true environment: @@ -96,7 +96,7 @@ services: - "${OPENCAST_SRC}:/usr/src/opencast" opencast-worker: - image: quay.io/opencast/build:16.6 + image: quay.io/opencast/build:16.7 tty: true stdin_open: true environment: diff --git a/docker-compose/docker-compose.multiserver.mariadb.yml b/docker-compose/docker-compose.multiserver.mariadb.yml index 6e6a1b5..ce7d716 100644 --- a/docker-compose/docker-compose.multiserver.mariadb.yml +++ b/docker-compose/docker-compose.multiserver.mariadb.yml @@ -41,7 +41,7 @@ services: - opensearch:/usr/share/opensearch/data opencast-admin: - image: quay.io/opencast/admin:16.6 + image: quay.io/opencast/admin:16.7 environment: ORG_OPENCASTPROJECT_SERVER_URL: http://opencast-admin:8080 ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8081/static @@ -62,7 +62,7 @@ services: - data:/data opencast-presentation: - image: quay.io/opencast/presentation:16.6 + image: quay.io/opencast/presentation:16.7 environment: ORG_OPENCASTPROJECT_SERVER_URL: http://opencast-presentation:8080 ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8081/static @@ -82,7 +82,7 @@ services: - data:/data opencast-worker: - image: quay.io/opencast/worker:16.6 + image: quay.io/opencast/worker:16.7 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 index bf95f81..c3ec26a 100644 --- a/docker-compose/docker-compose.multiserver.postgres.yml +++ b/docker-compose/docker-compose.multiserver.postgres.yml @@ -39,7 +39,7 @@ services: - opensearch:/usr/share/opensearch/data opencast-admin: - image: quay.io/opencast/admin:16.6 + image: quay.io/opencast/admin:16.7 environment: ORG_OPENCASTPROJECT_SERVER_URL: http://opencast-admin:8080 ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8081/static @@ -60,7 +60,7 @@ services: - data:/data opencast-presentation: - image: quay.io/opencast/presentation:16.6 + image: quay.io/opencast/presentation:16.7 environment: ORG_OPENCASTPROJECT_SERVER_URL: http://opencast-presentation:8080 ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8081/static @@ -80,7 +80,7 @@ services: - data:/data opencast-worker: - image: quay.io/opencast/worker:16.6 + image: quay.io/opencast/worker:16.7 environment: ORG_OPENCASTPROJECT_SERVER_URL: http://opencast-worker:8080 ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8081/static diff --git a/rootfs/opencast/etc/org.ops4j.pax.web.cfg b/rootfs/opencast/etc/org.ops4j.pax.web.cfg index 0011dea..bbce7de 100644 --- a/rootfs/opencast/etc/org.ops4j.pax.web.cfg +++ b/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