Skip to content

Commit

Permalink
Update Opencast to v16.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mtneug committed Jun 14, 2024
1 parent 2ff15fe commit 6b6b754
Show file tree
Hide file tree
Showing 18 changed files with 59 additions and 44 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,24 @@ jobs:
opencast_version: 'master'
push_major: 'false'
- day_of_week: '1'
opencast_version: '15.6'
opencast_version: '16.0'
push_major: 'true'
- day_of_week: '2'
opencast_version: '15.5'
opencast_version: '16.0'
push_major: 'false'
- day_of_week: '3'
opencast_version: '15.4'
opencast_version: '16.0'
push_major: 'false'

# legacy
- day_of_week: '4'
opencast_version: '14.12'
opencast_version: '15.6'
push_major: 'true'
- day_of_week: '5'
opencast_version: '14.11'
opencast_version: '15.5'
push_major: 'false'
- day_of_week: '6'
opencast_version: '14.10'
opencast_version: '15.4'
push_major: 'false'

steps:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 `15.6` is `quay.io/opencast/admin:15.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.0` is `quay.io/opencast/admin:16.0`. Leaving the version out will install the latest one.

### `allinone`

Expand Down Expand Up @@ -157,7 +157,7 @@ Make sure to use the correct Opencast distribution as there are small difference
- `ORG_OPENCASTPROJECT_DOWNLOAD_URL` Optional<br>
The HTTP-URL to use for downloading media files, e.g. for the player. Defaults to `${org.opencastproject.server.url}/static`.
- `ORG_OPENCASTPROJECT_ADMIN_EMAIL` Optional<br>
Email address of the server's admin. Defaults to `admin@localhost`.
Email address of the server's admin. Defaults to `[email protected]`.

For an installation with multiple nodes you can also set:

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
15.6
16.0
2 changes: 1 addition & 1 deletion VERSION_FFMPEG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
N-68649-g40c5c19eac
7.0.1
2 changes: 1 addition & 1 deletion VERSION_MAJOR
Original file line number Diff line number Diff line change
@@ -1 +1 @@
15
16
2 changes: 1 addition & 1 deletion VERSION_OPENCAST
Original file line number Diff line number Diff line change
@@ -1 +1 @@
15.6
16.0
2 changes: 1 addition & 1 deletion VERSION_WHISPER_CPP
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.5.4
v1.6.2
2 changes: 1 addition & 1 deletion docker-compose/docker-compose.allinone.h2+pyca.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ services:
- opensearch:/usr/share/opensearch/data

opencast:
image: quay.io/opencast/allinone:15.6
image: quay.io/opencast/allinone:16.0
environment:
ORG_OPENCASTPROJECT_SERVER_URL: http://opencast:8080
ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8080/static
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/docker-compose.allinone.h2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ services:
- opensearch:/usr/share/opensearch/data

opencast:
image: quay.io/opencast/allinone:15.6
image: quay.io/opencast/allinone:16.0
environment:
ORG_OPENCASTPROJECT_SERVER_URL: http://localhost:8080
ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8080/static
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/docker-compose.allinone.mariadb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ services:
- opensearch:/usr/share/opensearch/data

opencast:
image: quay.io/opencast/allinone:15.6
image: quay.io/opencast/allinone:16.0
environment:
ORG_OPENCASTPROJECT_SERVER_URL: http://localhost:8080
ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8080/static
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/docker-compose.allinone.postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ services:
- opensearch:/usr/share/opensearch/data

opencast:
image: quay.io/opencast/allinone:15.6
image: quay.io/opencast/allinone:16.0
environment:
ORG_OPENCASTPROJECT_SERVER_URL: http://localhost:8080
ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8080/static
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/docker-compose.build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ services:
- opensearch:/usr/share/opensearch/data

opencast:
image: quay.io/opencast/build:15.6
image: quay.io/opencast/build:16.0
tty: true
stdin_open: true
environment:
Expand Down
6 changes: 3 additions & 3 deletions docker-compose/docker-compose.multiserver.build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ services:
- opensearch:/usr/share/opensearch/data

opencast-admin:
image: quay.io/opencast/build:15.6
image: quay.io/opencast/build:16.0
tty: true
stdin_open: true
environment:
Expand Down Expand Up @@ -71,7 +71,7 @@ services:
- "${OPENCAST_SRC}:/usr/src/opencast"

opencast-presentation:
image: quay.io/opencast/build:15.6
image: quay.io/opencast/build:16.0
tty: true
stdin_open: true
environment:
Expand All @@ -98,7 +98,7 @@ services:
- "${OPENCAST_SRC}:/usr/src/opencast"

opencast-worker:
image: quay.io/opencast/build:15.6
image: quay.io/opencast/build:16.0
tty: true
stdin_open: true
environment:
Expand Down
6 changes: 3 additions & 3 deletions docker-compose/docker-compose.multiserver.mariadb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ services:
- opensearch:/usr/share/opensearch/data

opencast-admin:
image: quay.io/opencast/admin:15.6
image: quay.io/opencast/admin:16.0
environment:
ORG_OPENCASTPROJECT_SERVER_URL: http://opencast-admin:8080
ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8081/static
Expand All @@ -64,7 +64,7 @@ services:
- data:/data

opencast-presentation:
image: quay.io/opencast/presentation:15.6
image: quay.io/opencast/presentation:16.0
environment:
ORG_OPENCASTPROJECT_SERVER_URL: http://opencast-presentation:8080
ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8081/static
Expand All @@ -84,7 +84,7 @@ services:
- data:/data

opencast-worker:
image: quay.io/opencast/worker:15.6
image: quay.io/opencast/worker:16.0
environment:
ORG_OPENCASTPROJECT_SERVER_URL: http://opencast-worker:8080
ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8081/static
Expand Down
6 changes: 3 additions & 3 deletions docker-compose/docker-compose.multiserver.postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ services:
- opensearch:/usr/share/opensearch/data

opencast-admin:
image: quay.io/opencast/admin:15.6
image: quay.io/opencast/admin:16.0
environment:
ORG_OPENCASTPROJECT_SERVER_URL: http://opencast-admin:8080
ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8081/static
Expand All @@ -62,7 +62,7 @@ services:
- data:/data

opencast-presentation:
image: quay.io/opencast/presentation:15.6
image: quay.io/opencast/presentation:16.0
environment:
ORG_OPENCASTPROJECT_SERVER_URL: http://opencast-presentation:8080
ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8081/static
Expand All @@ -82,7 +82,7 @@ services:
- data:/data

opencast-worker:
image: quay.io/opencast/worker:15.6
image: quay.io/opencast/worker:16.0
environment:
ORG_OPENCASTPROJECT_SERVER_URL: http://opencast-worker:8080
ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8081/static
Expand Down
2 changes: 1 addition & 1 deletion rootfs/opencast/docker/scripts/opencast.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
set -e

export ORG_OPENCASTPROJECT_SERVER_URL="${ORG_OPENCASTPROJECT_SERVER_URL:-http://$(hostname -f):8080}"
export ORG_OPENCASTPROJECT_ADMIN_EMAIL="${ORG_OPENCASTPROJECT_ADMIN_EMAIL:-admin@localhost}"
export ORG_OPENCASTPROJECT_ADMIN_EMAIL="${ORG_OPENCASTPROJECT_ADMIN_EMAIL:-example@opencast.org}"
export ORG_OPENCASTPROJECT_DOWNLOAD_URL="${ORG_OPENCASTPROJECT_DOWNLOAD_URL:-\$\{org.opencastproject.server.url\}/static}"

if opencast_helper_dist_allinone || opencast_helper_dist_develop; then
Expand Down
2 changes: 1 addition & 1 deletion rootfs/opencast/etc/custom.properties
Original file line number Diff line number Diff line change
Expand Up @@ -361,5 +361,5 @@ karaf.pid.file=${karaf.data}/pid
# distributed artifacts on the downloads and streaming servers, all of which are protected by verification components.
# Default is 60 seconds as it shouldn't take longer than that to make a request to a server. This will have no impact on
# a system where url signing is not configured. For more information please see:
# http://docs.opencast.org/develop/admin/configuration/stream-security/#configuration-of-url-signing-timeout-values
# https://docs.opencast.org/develop/admin/#configuration/stream-security/stream-security-config/#configuration-of-url-signing-timeout-values
#org.opencastproject.security.internal.url.signing.duration=60
Original file line number Diff line number Diff line change
Expand Up @@ -132,19 +132,19 @@ prop.org.opencastproject.admin.mediamodule.url=${prop.org.opencastproject.engage
#
#prop.org.opencastproject.admin.feedback.url=

# Link to the Engage UI.
# Flag to display imprint and privacy in admin-UIs footer
#
# Value: <a complete url with scheme and port>
# Default: ${org.opencastproject.server.url}
# Value: <boolean>
# Default: false
#
prop.org.opencastproject.engage.ui.url={{PROP_ORG_OPENCASTPROJECT_ENGAGE_UI_URL}}
#prop.org.opencastproject.admin.display_about=false

# Link to the RSS and atom feed base
# Link to the Engage UI.
#
# Value: <a complete url with scheme and port>
# Default: ${org.opencastproject.server.url}
#
#prop.org.opencastproject.feed.url=http://localhost:8080
prop.org.opencastproject.engage.ui.url={{PROP_ORG_OPENCASTPROJECT_ENGAGE_UI_URL}}

# Link to the External API
#
Expand All @@ -160,6 +160,20 @@ prop.org.opencastproject.engage.ui.url={{PROP_ORG_OPENCASTPROJECT_ENGAGE_UI_URL}
#
#prop.org.opencastproject.assetmanager.url=http://localhost:8080

# Path to the default video player used by the engage interfaces and the LTI tools. Parameters for selecting the
# specific videos will be appended automatically. Common values include:
#
# - paella player 7: /paella7/ui/watch.html?id=#{id}
#
# Default: /paella7/ui/watch.html?id=#{id}
#prop.player=/paella7/ui/watch.html?id=#{id}


###
# ⚠️ Settings specific to the old admin interface
# These settings are deprecated and will likely be removed with Opencast 17
# ##

# Set a flag to display External Roles on User modal
#
# Value: <boolean>
Expand All @@ -175,15 +189,6 @@ prop.adminui.user.external_role_display=false
# Default: USERS.NAME.AND.USERNAME
#prop.adminui.user.listname=USERS.NAME.AND.USERNAME

# Path to the default video player used by the engage interfaces and the LTI tools. Parameters for selecting the
# specific videos will be appended automatically. Common values include:
#
# - paella player 6: /paella/ui/watch.html?id=#{id} ← requires plugin
# - paella player 7: /paella7/ui/watch.html?id=#{id}
#
# Default: /paella7/ui/watch.html?id=#{id}
#prop.player=/paella7/ui/watch.html?id=#{id}

# Shortcut definitions for admin UI video player
# Format: prop.admin.shortcut.player<action>=<key>
prop.admin.shortcut.player.play_pause=space
Expand Down Expand Up @@ -359,3 +364,13 @@ 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

0 comments on commit 6b6b754

Please sign in to comment.