From acec85be1b859ccb83dd4b825f6e779344c89001 Mon Sep 17 00:00:00 2001 From: Matthias Neugebauer Date: Wed, 3 Jul 2024 09:44:10 +0200 Subject: [PATCH] Update Opencast to v16.1 --- .github/workflows/cron.yml | 4 +-- 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 ++-- ....organization-mh_default_org.cfg-clustered | 32 +++++++++---------- 13 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml index 2891495..e5f0c6d 100644 --- a/.github/workflows/cron.yml +++ b/.github/workflows/cron.yml @@ -27,10 +27,10 @@ jobs: opencast_version: 'master' push_major: 'false' - day_of_week: '1' - opencast_version: '16.0' + opencast_version: '16.1' push_major: 'true' - day_of_week: '2' - opencast_version: '16.0' + opencast_version: '16.1' push_major: 'false' - day_of_week: '3' opencast_version: '16.0' diff --git a/README.md b/README.md index 147b391..e908ce1 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.0` is `quay.io/opencast/admin:16.0`. 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.1` is `quay.io/opencast/admin:16.1`. Leaving the version out will install the latest one. ### `allinone` diff --git a/VERSION b/VERSION index 0d68f8a..c32b0ec 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.0 +16.1 diff --git a/VERSION_OPENCAST b/VERSION_OPENCAST index 0d68f8a..c32b0ec 100644 --- a/VERSION_OPENCAST +++ b/VERSION_OPENCAST @@ -1 +1 @@ -16.0 +16.1 diff --git a/docker-compose/docker-compose.allinone.h2+pyca.yml b/docker-compose/docker-compose.allinone.h2+pyca.yml index 50a41ca..75dee40 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.0 + image: quay.io/opencast/allinone:16.1 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 d667a91..b8ef39f 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.0 + image: quay.io/opencast/allinone:16.1 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 dff90e7..d52772d 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.0 + image: quay.io/opencast/allinone:16.1 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 c1e0ed9..0cb92a5 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.0 + image: quay.io/opencast/allinone:16.1 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 b5e00ce..e039194 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.0 + image: quay.io/opencast/build:16.1 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 84f3175..8a37c6e 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.0 + image: quay.io/opencast/build:16.1 tty: true stdin_open: true environment: @@ -69,7 +69,7 @@ services: - "${OPENCAST_SRC}:/usr/src/opencast" opencast-presentation: - image: quay.io/opencast/build:16.0 + image: quay.io/opencast/build:16.1 tty: true stdin_open: true environment: @@ -96,7 +96,7 @@ services: - "${OPENCAST_SRC}:/usr/src/opencast" opencast-worker: - image: quay.io/opencast/build:16.0 + image: quay.io/opencast/build:16.1 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 b5f6621..4a06940 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.0 + image: quay.io/opencast/admin:16.1 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.0 + image: quay.io/opencast/presentation:16.1 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.0 + image: quay.io/opencast/worker:16.1 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 2ab6acf..25a243a 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.0 + image: quay.io/opencast/admin:16.1 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.0 + image: quay.io/opencast/presentation:16.1 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.0 + image: quay.io/opencast/worker:16.1 environment: ORG_OPENCASTPROJECT_SERVER_URL: http://opencast-worker:8080 ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8081/static diff --git a/rootfs/opencast/etc/org.opencastproject.organization-mh_default_org.cfg-clustered b/rootfs/opencast/etc/org.opencastproject.organization-mh_default_org.cfg-clustered index c8e696b..5590285 100644 --- a/rootfs/opencast/etc/org.opencastproject.organization-mh_default_org.cfg-clustered +++ b/rootfs/opencast/etc/org.opencastproject.organization-mh_default_org.cfg-clustered @@ -168,6 +168,22 @@ prop.org.opencastproject.engage.ui.url={{PROP_ORG_OPENCASTPROJECT_ENGAGE_UI_URL} # Default: /paella7/ui/watch.html?id=#{id} #prop.player=/paella7/ui/watch.html?id=#{id} +# Whether the ACL of a new event is initialized with the ACL of its series. +# +# Format: Boolean +# Default: true +#prop.admin.init.event.acl.with.series.acl=true + +# Enable themes in the admin interface. +# Format: boolean +# Default: true +prop.admin.themes.enabled=false + +# Enable the sttatistics views in the admin intterface. +# Format: boolean +# Default: false +#prop.admin.statistics.enabled=false + ### # ⚠️ Settings specific to the old admin interface @@ -325,12 +341,6 @@ prop.admin.shortcut.add_media.previous_tab=shift+alt+left # Default: optional #prop.admin.series.acl.event.update.mode=optional -# Whether the ACL of a new event is initialized with the ACL of its series. -# -# Format: Boolean -# Default: true -#prop.admin.init.event.acl.with.series.acl=true - # Default values for trim segment in the editor. # Default: In milliseconds # @@ -364,13 +374,3 @@ prop.admin.shortcut.add_media.previous_tab=shift+alt+left # The external editing tool: /editor-ui/index.html?id=$id # Default: /editor-ui/index.html?id=$id #prop.admin.editor.url=/editor-ui/index.html?id=$id - -# Enable themes in the admin interface. -# Format: boolean -# Default: true -prop.admin.themes.enabled=false - -# Enable the sttatistics views in the admin intterface. -# Format: boolean -# Default: false -#prop.admin.statistics.enabled=false