get recording server from its repo

Signed-off-by: Simon L <szaimen@e.mail.de>
This commit is contained in:
Simon L 2023-11-16 11:43:49 +01:00
parent ea5965c149
commit 542a6a0cbe
4 changed files with 29 additions and 16 deletions

View file

@ -11,18 +11,18 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Run talk-update - name: Run talk-container-update
run: | run: |
# Spreed # Recording
spreed_version="$( recording_version="$(
git ls-remote https://github.com/nextcloud/spreed v*.*.* \ git ls-remote https://github.com/nextcloud/nextcloud-talk-recording v* \
| cut -d/ -f3 \ | cut -d/ -f3 \
| sort -V \ | sort -V \
| grep -E "^v[0-9]+\.[0-9]+\.[0-9]+$" \ | grep -E "^v[0-9]+\.[0-9\.]+$" \
| tail -1 | tail -1
)" )"
sed -i "s|^ENV RECORDING_VERSION.*$|ENV RECORDING_VERSION $spreed_version|" ./Containers/talk-recording/Dockerfile sed -i "s|^ENV RECORDING_VERSION.*$|ENV RECORDING_VERSION $recording_version|" ./Containers/talk-recording/Dockerfile
curl -L "https://raw.githubusercontent.com/nextcloud/spreed/$spreed_version/recording/server.conf.in" -o Containers/talk-recording/recording.conf curl -L "https://raw.githubusercontent.com/nextcloud/nextcloud-talk-recording/$recording_version/server.conf.in" -o Containers/talk-recording/recording.conf
# Signaling # Signaling
signaling_version="$( signaling_version="$(
@ -49,7 +49,7 @@ jobs:
with: with:
commit-message: talk-update automated change commit-message: talk-update automated change
signoff: true signoff: true
title: talk update title: talk container update
body: Automated talk container update body: Automated talk container update
labels: dependencies, 3. to review labels: dependencies, 3. to review
milestone: next milestone: next

View file

@ -2,7 +2,7 @@ FROM python:3.12.0-alpine3.18
COPY --chmod=775 start.sh /start.sh COPY --chmod=775 start.sh /start.sh
ENV RECORDING_VERSION v17.1.2 ENV RECORDING_VERSION v0.1
ENV ALLOW_ALL false ENV ALLOW_ALL false
ENV HPB_PROTOCOL https ENV HPB_PROTOCOL https
ENV SKIP_VERIFY false ENV SKIP_VERIFY false
@ -28,9 +28,8 @@ RUN set -ex; \
useradd -d /tmp --system recording; \ useradd -d /tmp --system recording; \
# Give root a random password # Give root a random password
echo "root:$(openssl rand -base64 12)" | chpasswd; \ echo "root:$(openssl rand -base64 12)" | chpasswd; \
git clone --recursive https://github.com/nextcloud/spreed --depth=1 --single-branch --branch "$RECORDING_VERSION" /src; \ git clone --recursive https://github.com/nextcloud/nextcloud-talk-recording --depth=1 --single-branch --branch "$RECORDING_VERSION" /src; \
mv -v /src/recording/pyproject.toml /src/recording/src/pyproject.toml; \ python3 -m pip install --no-cache-dir /src; \
python3 -m pip install --no-cache-dir /src/recording/src; \
rm -rf /src; \ rm -rf /src; \
touch /etc/recording.conf; \ touch /etc/recording.conf; \
chown recording:recording -R \ chown recording:recording -R \

View file

@ -96,11 +96,15 @@
#internalsecret = the-shared-secret-for-internal-clients #internalsecret = the-shared-secret-for-internal-clients
[ffmpeg] [ffmpeg]
# The options given to FFmpeg to encode the audio output. The options given here # The ffmpeg executable (name or full path) and the global options given to
# ffmpeg. The options given here fully override the default global options.
#common = ffmpeg -loglevel level+warning -n
# The options given to ffmpeg to encode the audio output. The options given here
# fully override the default options for the audio output. # fully override the default options for the audio output.
#outputaudio = -c:a libopus #outputaudio = -c:a libopus
# The options given to FFmpeg to encode the video output. The options given here # The options given to ffmpeg to encode the video output. The options given here
# fully override the default options for the video output. # fully override the default options for the video output.
#outputvideo = -c:v libvpx -deadline:v realtime -crf 10 -b:v 1M #outputvideo = -c:v libvpx -deadline:v realtime -crf 10 -b:v 1M
@ -109,3 +113,11 @@
# The extension of the file for audio and video recordings. # The extension of the file for audio and video recordings.
#extensionvideo = .webm #extensionvideo = .webm
[recording]
# Browser to use for recordings. Please note that the "chrome" value does not
# refer to the web browser, but to the Selenium WebDriver. In practice, "chrome"
# will use Google Chrome, or Chromium if Google Chrome is not installed.
# Allowed values: firefox, chrome
# Defaults to firefox
# browser = firefox

View file

@ -26,8 +26,6 @@ listen = 0.0.0.0:1234
[backend] [backend]
allowall = ${ALLOW_ALL} allowall = ${ALLOW_ALL}
# TODO: remove secret below when https://github.com/nextcloud/spreed/issues/9580 is fixed
secret = ${RECORDING_SECRET}
backends = backend-1 backends = backend-1
skipverify = ${SKIP_VERIFY} skipverify = ${SKIP_VERIFY}
maxmessagesize = 1024 maxmessagesize = 1024
@ -48,10 +46,14 @@ url = ${HPB_PROTOCOL}://${HPB_DOMAIN}${HPB_PATH}
internalsecret = ${INTERNAL_SECRET} internalsecret = ${INTERNAL_SECRET}
[ffmpeg] [ffmpeg]
# common = ffmpeg -loglevel level+warning -n
# outputaudio = -c:a libopus # outputaudio = -c:a libopus
# outputvideo = -c:v libvpx -deadline:v realtime -crf 10 -b:v 1M # outputvideo = -c:v libvpx -deadline:v realtime -crf 10 -b:v 1M
extensionaudio = .ogg extensionaudio = .ogg
extensionvideo = .webm extensionvideo = .webm
[recording]
browser = firefox
RECORDING_CONF RECORDING_CONF
exec "$@" exec "$@"