From 122a12fb1a0d0d2a5d3315c87a2c31f963fc3c12 Mon Sep 17 00:00:00 2001 From: Matthias Neugebauer Date: Tue, 11 Jun 2024 14:55:49 +0200 Subject: [PATCH] Update Opencast to v14.13 --- .github/workflows/cron.yml | 6 +++--- README.md | 2 +- VERSION | 2 +- VERSION_OPENCAST | 2 +- .../docker-compose.allinone.h2+pyca.yml | 2 +- docker-compose/docker-compose.allinone.h2.yml | 2 +- .../docker-compose.allinone.mariadb.yml | 2 +- .../docker-compose.allinone.postgres.yml | 2 +- docker-compose/docker-compose.build.yml | 2 +- .../docker-compose.multiserver.build.yml | 6 +++--- .../docker-compose.multiserver.mariadb.yml | 6 +++--- .../docker-compose.multiserver.postgres.yml | 6 +++--- rootfs/opencast/etc/custom.properties | 15 +++++++++++---- 13 files changed, 31 insertions(+), 24 deletions(-) diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml index 9cfc89bc..dcc20c4d 100644 --- a/.github/workflows/cron.yml +++ b/.github/workflows/cron.yml @@ -26,13 +26,13 @@ jobs: opencast_version: 'master' push_major: 'false' - day_of_week: '1' - opencast_version: '14.12' + opencast_version: '14.13' push_major: 'true' - day_of_week: '2' - opencast_version: '14.11' + opencast_version: '14.12' push_major: 'false' - day_of_week: '3' - opencast_version: '14.10' + opencast_version: '14.11' push_major: 'false' # legacy diff --git a/README.md b/README.md index 3316f25d..077a4671 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,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 `14.12` is `quay.io/opencast/admin:14.12`. 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 `14.13` is `quay.io/opencast/admin:14.13`. Leaving the version out will install the latest one. ### `allinone` diff --git a/VERSION b/VERSION index 8ca53de5..a6c12084 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.12 +14.13 diff --git a/VERSION_OPENCAST b/VERSION_OPENCAST index 8ca53de5..a6c12084 100644 --- a/VERSION_OPENCAST +++ b/VERSION_OPENCAST @@ -1 +1 @@ -14.12 +14.13 diff --git a/docker-compose/docker-compose.allinone.h2+pyca.yml b/docker-compose/docker-compose.allinone.h2+pyca.yml index 8cbfb2a3..26d09672 100644 --- a/docker-compose/docker-compose.allinone.h2+pyca.yml +++ b/docker-compose/docker-compose.allinone.h2+pyca.yml @@ -32,7 +32,7 @@ services: - opensearch:/usr/share/opensearch/data opencast: - image: quay.io/opencast/allinone:14.12 + image: quay.io/opencast/allinone:14.13 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 0e90aca5..0a9aa878 100644 --- a/docker-compose/docker-compose.allinone.h2.yml +++ b/docker-compose/docker-compose.allinone.h2.yml @@ -31,7 +31,7 @@ services: - opensearch:/usr/share/opensearch/data opencast: - image: quay.io/opencast/allinone:14.12 + image: quay.io/opencast/allinone:14.13 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 bbb7790c..cdeb6bd5 100644 --- a/docker-compose/docker-compose.allinone.mariadb.yml +++ b/docker-compose/docker-compose.allinone.mariadb.yml @@ -43,7 +43,7 @@ services: - opensearch:/usr/share/opensearch/data opencast: - image: quay.io/opencast/allinone:14.12 + image: quay.io/opencast/allinone:14.13 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 b04de437..e74c0198 100644 --- a/docker-compose/docker-compose.allinone.postgres.yml +++ b/docker-compose/docker-compose.allinone.postgres.yml @@ -41,7 +41,7 @@ services: - opensearch:/usr/share/opensearch/data opencast: - image: quay.io/opencast/allinone:14.12 + image: quay.io/opencast/allinone:14.13 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 f69047fc..6d07f9b8 100644 --- a/docker-compose/docker-compose.build.yml +++ b/docker-compose/docker-compose.build.yml @@ -31,7 +31,7 @@ services: - opensearch:/usr/share/opensearch/data opencast: - image: quay.io/opencast/build:14.12 + image: quay.io/opencast/build:14.13 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 2cee1c41..27ce21e7 100644 --- a/docker-compose/docker-compose.multiserver.build.yml +++ b/docker-compose/docker-compose.multiserver.build.yml @@ -43,7 +43,7 @@ services: - opensearch:/usr/share/opensearch/data opencast-admin: - image: quay.io/opencast/build:14.12 + image: quay.io/opencast/build:14.13 tty: true stdin_open: true environment: @@ -71,7 +71,7 @@ services: - "${OPENCAST_SRC}:/usr/src/opencast" opencast-presentation: - image: quay.io/opencast/build:14.12 + image: quay.io/opencast/build:14.13 tty: true stdin_open: true environment: @@ -98,7 +98,7 @@ services: - "${OPENCAST_SRC}:/usr/src/opencast" opencast-worker: - image: quay.io/opencast/build:14.12 + image: quay.io/opencast/build:14.13 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 bb6c850c..a35f7078 100644 --- a/docker-compose/docker-compose.multiserver.mariadb.yml +++ b/docker-compose/docker-compose.multiserver.mariadb.yml @@ -43,7 +43,7 @@ services: - opensearch:/usr/share/opensearch/data opencast-admin: - image: quay.io/opencast/admin:14.12 + image: quay.io/opencast/admin:14.13 environment: ORG_OPENCASTPROJECT_SERVER_URL: http://opencast-admin:8080 ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8081/static @@ -64,7 +64,7 @@ services: - data:/data opencast-presentation: - image: quay.io/opencast/presentation:14.12 + image: quay.io/opencast/presentation:14.13 environment: ORG_OPENCASTPROJECT_SERVER_URL: http://opencast-presentation:8080 ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8081/static @@ -84,7 +84,7 @@ services: - data:/data opencast-worker: - image: quay.io/opencast/worker:14.12 + image: quay.io/opencast/worker:14.13 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 4623365f..4ecc420f 100644 --- a/docker-compose/docker-compose.multiserver.postgres.yml +++ b/docker-compose/docker-compose.multiserver.postgres.yml @@ -41,7 +41,7 @@ services: - opensearch:/usr/share/opensearch/data opencast-admin: - image: quay.io/opencast/admin:14.12 + image: quay.io/opencast/admin:14.13 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:14.12 + image: quay.io/opencast/presentation:14.13 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:14.12 + image: quay.io/opencast/worker:14.13 environment: ORG_OPENCASTPROJECT_SERVER_URL: http://opencast-worker:8080 ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8081/static diff --git a/rootfs/opencast/etc/custom.properties b/rootfs/opencast/etc/custom.properties index c6a21f4b..123f746e 100644 --- a/rootfs/opencast/etc/custom.properties +++ b/rootfs/opencast/etc/custom.properties @@ -125,14 +125,21 @@ org.opencastproject.db.jdbc.user={{ORG_OPENCASTPROJECT_DB_JDBC_USER}} org.opencastproject.db.jdbc.pass={{ORG_OPENCASTPROJECT_DB_JDBC_PASS}} # The jdbc connection pool properties. See https://mchange.com/projects/c3p0/#basic_pool_configuration -# max.idle.time should be lower than the database server idle connection timeout duration (wait_timeout for MariaDB) +# and https://www.mchange.com/projects/c3p0/#configuration_properties #org.opencastproject.db.jdbc.pool.max.size=15 #org.opencastproject.db.jdbc.pool.min.size=3 #org.opencastproject.db.jdbc.pool.acquire.increment=3 #org.opencastproject.db.jdbc.pool.max.statements=0 -#org.opencastproject.db.jdbc.pool.login.timeout=1000 -#org.opencastproject.db.jdbc.pool.max.idle.time=3600 -#org.opencastproject.db.jdbc.pool.max.connection.age=0 +#org.opencastproject.db.jdbc.pool.login.timeout=60 +# max.idle.time should be lower than the database server idle connection timeout duration (wait_timeout for MariaDB) +#org.opencastproject.db.jdbc.pool.max.idle.time=1800 +#org.opencastproject.db.jdbc.pool.max.connection.age=28800 +# Idle connection testing documentation: https://www.mchange.com/projects/c3p0/#configuring_connection_testing +#org.opencastproject.db.jdbc.pool.test.connection.on.checkin = false +# Setting test.connection.on.checkout to true is the most costly choice from a client-performance perspective. +# In most cases a combination of test.connection.on.checkin and idle.connection.test.period will be a better choice. +#org.opencastproject.db.jdbc.pool.test.connection.on.checkout = false +#org.opencastproject.db.jdbc.pool.idle.connection.test.period = 300 ######### Workspace Cleanup #########