v3.0.0-beta.5: recording via bbb-webrtc-recorder and etherpad export

.gitmodules

@@ -24,4 +24,4 @@
 	url = https://github.com/bigbluebutton/bbb-pads.git
 [submodule "repos/bbb-webrtc-recorder"]
 	path = repos/bbb-webrtc-recorder
-	url = https://github.com/bigbluebutton/bbb-webrtc-recorder
+	url = https://github.com/bigbluebutton/bbb-webrtc-recorder.git

docker-compose.tmpl.yml

@@ -129,6 +129,7 @@ services:
     restart: unless-stopped
     depends_on:
       - redis
+      - collabora
     environment:
       ETHERPAD_API_KEY: ${ETHERPAD_API_KEY}
     networks:
@@ -377,11 +378,12 @@ services:
     depends_on:
       - redis
     volumes: 
-      - ./mod/bbb-webrtc-recorder/bbb-webrtc-recorder.yml:/etc/bbb-webrtc-recorder/bbb-webrtc-recorder.yml
       - ./data/bbb-webrtc-recorder:/var/lib/bbb-webrtc-recorder
-    networks:
-      bbb-net:
-        ipv4_address: 10.7.7.19
+    # WebRTC connection to bbb-webrtc-sfu seem to 
+    # only to work via the external IP
+    network_mode: host
+    extra_hosts:
+      - "redis:10.7.7.5"
 {{end}}
 
 {{ if isTrue .Env.ENABLE_WEBHOOKS }}

mod/bbb-web/entrypoint.sh

@@ -2,6 +2,9 @@
 set -e
 
 # create recording directory structure if it doesn't exist yet
+mkdir -p /var/bigbluebutton/recording/status
+mkdir -p /var/bigbluebutton/events
+mkdir -p /var/bigbluebutton/recording
 mkdir -p /var/bigbluebutton/recording/raw
 mkdir -p /var/bigbluebutton/recording/process
 mkdir -p /var/bigbluebutton/recording/publish
@@ -9,17 +12,14 @@ mkdir -p /var/bigbluebutton/recording/status/recorded
 mkdir -p /var/bigbluebutton/recording/status/archived
 mkdir -p /var/bigbluebutton/recording/status/processed
 mkdir -p /var/bigbluebutton/recording/status/sanity
-mkdir -p /var/bigbluebutton/recording/status/ended
 mkdir -p /var/bigbluebutton/recording/status/published
-mkdir -p /var/bigbluebutton/captions/inbox
+mkdir -p /var/bigbluebutton/captions
 mkdir -p /var/bigbluebutton/published
-mkdir -p /var/bigbluebutton/published/notes
 mkdir -p /var/bigbluebutton/deleted
 mkdir -p /var/bigbluebutton/unpublished
+mkdir -p /var/bigbluebutton/basic_stats
 chown -R bigbluebutton:bigbluebutton /var/bigbluebutton
 
-echo "$NUMBER_OF_BACKEND_NODEJS_PROCESSES" > /tmp/NUMBER_OF_BACKEND_NODEJS_PROCESSES
-
 cd /usr/share/bbb-web/
 dockerize \
     -template /etc/bigbluebutton/bbb-web.properties.tmpl:/etc/bigbluebutton/bbb-web.properties \

mod/bbb-webrtc-recorder/Dockerfile

@@ -1,5 +1,5 @@
 # Build stage
-FROM golang:1.19 as builder
+FROM golang:1.21 as builder
 
 ARG APP_VERSION=devel
 ARG GOMOD=github.com/bigbluebutton/bbb-webrtc-recorder
@@ -12,24 +12,29 @@ RUN go mod tidy
 
 COPY --from=src . ./
 
-RUN go build -o ./build/bbb-webrtc-recorder \
-      -buildvcs=false \
-      -ldflags="-X '${GOMOD}/internal.AppVersion=${APP_VERSION}'" \
+RUN APP_VERSION=$(cat ./VERSION | sed 's/ /-/g') \
+      go build -o ./build/bbb-webrtc-recorder \
+      -ldflags="-X '$GOMOD/internal.AppVersion=v${APP_VERSION1}'" \
       ./cmd/bbb-webrtc-recorder
 
-RUN mv /app/build/bbb-webrtc-recorder /usr/bin/bbb-webrtc-recorder
 
-RUN rm -rf /app
+RUN mv /app/build/bbb-webrtc-recorder /usr/bin/bbb-webrtc-recorder
 
 # Running stage
 FROM debian:bookworm-slim
 
 RUN apt-get update && apt-get install -y gosu
 
-# Copy the binary to the production image from the builder stage.
-COPY --from=builder /usr/bin/bbb-webrtc-recorder /usr/bin/bbb-webrtc-recorder
-
 # use same UID as in the recordings container
 RUN groupadd -g 998 bigbluebutton && useradd -m -u 998 -g bigbluebutton bigbluebutton
 
+# config
+ENV BBBRECORDER_PUBSUB_ADAPTERS_REDIS_ADDRESS=redis:6379
+ENV BBBRECORDER_PUBSUB_ADAPTERS_REDIS_NETWORK=tcp
+ENV BBBRECORDER_DEBUG=true
+
+# Copy the binary to the production image from the builder stage.
+COPY --from=builder /usr/bin/bbb-webrtc-recorder /usr/bin/bbb-webrtc-recorder
+COPY --from=builder /app/config/bbb-webrtc-recorder.yml /etc/bbb-webrtc-recorder/bbb-webrtc-recorder.yml
+
 CMD ["/bin/sh", "-c", "chown -R bigbluebutton:bigbluebutton /var/lib/bbb-webrtc-recorder && gosu bigbluebutton /usr/bin/bbb-webrtc-recorder"]

mod/bbb-webrtc-recorder/bbb-webrtc-recorder.yml

@@ -1,39 +0,0 @@
-debug: false
-
-recorder:
-  directory: /var/lib/bbb-webrtc-recorder
-  dirFileMode: 0700
-  fileMode: 0600
-
-pubsub:
-  channels:
-    subscribe: to-bbb-webrtc-recorder
-    publish: from-bbb-webrtc-recorder
-  adapter: redis
-  adapters:
-    redis:
-      address: redis:6379
-      network: tcp
-      #password: foobared
-
-webrtc:
-  rtcMinPort: 24577
-  rtcMaxPort: 32768
-  jitterBuffer: 512
-  iceServers:
-    - urls: []
-# Example turn server
-#    - urls:
-#        - turn:turnserver.example.org:1234
-#      username: webrtc
-#      credential: turnpassword
-
-# HTTP server for testing
-# (should be disabled in production)
-http:
-  port: 8080
-  enable: false
-
-prometheus:
-  enable: false
-  listenAddress: 127.0.0.1:3200

mod/etherpad/etherpad-export.sh

@@ -4,9 +4,6 @@ dest="$(echo $8 | sed -E -e 's/html|odt/'$7'/')"
 convertTo="$7"
 
 
-curl -v -X POST "http://jodconverter:8080/lool/convert-to/$convertTo" \
-    -H "accept: application/octet-stream" \
-    -H "Content-Type: multipart/form-data" \
-    -F "data=@$src" > $dest
+curl -v -F "data=@${src}" -k https://collabora:9980/cool/convert-to/$convertTo > "${dest}"
 
 exit 0

repos/bbb-webrtc-recorder

@@ -0,0 +1 @@
+Subproject commit b121d3caa4ff8101e4d9404247686913b1552fe3