Skip to content

Commit

Permalink
Update Opencast to v14.13
Browse files Browse the repository at this point in the history
  • Loading branch information
mtneug committed Jun 11, 2024
1 parent 65bf29c commit 122a12f
Show file tree
Hide file tree
Showing 13 changed files with 31 additions and 24 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.12
14.13
2 changes: 1 addition & 1 deletion VERSION_OPENCAST
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.12
14.13
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: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
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: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
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: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
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: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
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:14.12
image: quay.io/opencast/build:14.13
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:14.12
image: quay.io/opencast/build:14.13
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:14.12
image: quay.io/opencast/build:14.13
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:14.12
image: quay.io/opencast/build:14.13
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: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
Expand All @@ -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
Expand All @@ -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
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: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
Expand All @@ -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
Expand All @@ -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
Expand Down
15 changes: 11 additions & 4 deletions rootfs/opencast/etc/custom.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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 #########
Expand Down

0 comments on commit 122a12f

Please sign in to comment.