Merge branch 'master' into dependabot/bundler/nokogiri-1.18.3

Author: farhatahmad

Dockerfile

@@ -1,19 +1,18 @@
 FROM alpine:3.20 AS alpine
 
-FROM ubuntu:20.04 AS bbb-playback
+FROM ubuntu:22.04 AS bbb-playback
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update \
     && apt-get install -y language-pack-en \
     && update-locale LANG=en_US.UTF-8
 ENV LANG=en_US.UTF-8
 RUN apt-get update \
     && apt-get install -y software-properties-common curl net-tools nginx
-RUN add-apt-repository -y ppa:bigbluebutton/support
-
-RUN apt-get update \
+RUN add-apt-repository -y ppa:rmescandon/yq \
+    && apt-get update \
     && apt-get install -y yq
 RUN curl -sL https://ubuntu.bigbluebutton.org/repo/bigbluebutton.asc | apt-key add - \
-    && echo "deb https://ubuntu.bigbluebutton.org/focal-260 bigbluebutton-focal main" >/etc/apt/sources.list.d/bigbluebutton.list
+    && echo "deb https://ubuntu.bigbluebutton.org/jammy-300 bigbluebutton-jammy main" >/etc/apt/sources.list.d/bigbluebutton.list
 RUN useradd --system --user-group --home-dir /var/bigbluebutton bigbluebutton
 RUN touch /.dockerenv
 RUN apt-get update \

dockerfiles/v1/focal260-alpine dockerfiles/v1/jammy300-alpinedockerfiles/v1/focal260-alpine renamed to dockerfiles/v1/jammy300-alpine

@@ -1,19 +1,18 @@
 FROM alpine:3.20 AS alpine
 
-FROM ubuntu:20.04 AS bbb-playback
+FROM ubuntu:22.04 AS bbb-playback
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update \
     && apt-get install -y language-pack-en \
     && update-locale LANG=en_US.UTF-8
 ENV LANG=en_US.UTF-8
 RUN apt-get update \
     && apt-get install -y software-properties-common curl net-tools nginx
-RUN add-apt-repository -y ppa:bigbluebutton/support
-
-RUN apt-get update \
+RUN add-apt-repository -y ppa:rmescandon/yq \
+    && apt-get update \
     && apt-get install -y yq
 RUN curl -sL https://ubuntu.bigbluebutton.org/repo/bigbluebutton.asc | apt-key add - \
-    && echo "deb https://ubuntu.bigbluebutton.org/focal-260 bigbluebutton-focal main" >/etc/apt/sources.list.d/bigbluebutton.list
+    && echo "deb https://ubuntu.bigbluebutton.org/jammy-300 bigbluebutton-jammy main" >/etc/apt/sources.list.d/bigbluebutton.list
 RUN useradd --system --user-group --home-dir /var/bigbluebutton bigbluebutton
 RUN touch /.dockerenv
 RUN apt-get update \

dockerfiles/v1/focal260-amazonlinux dockerfiles/v1/jammy300-amazonlinuxdockerfiles/v1/focal260-amazonlinux renamed to dockerfiles/v1/jammy300-amazonlinux

@@ -1,20 +1,19 @@
 FROM amazonlinux:2.0.20240620.0 AS amazonlinux
 SHELL ["/bin/bash", "-c"]
 
-FROM ubuntu:20.04 AS bbb-playback
+FROM ubuntu:22.04 AS bbb-playback
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update \
     && apt-get install -y language-pack-en \
     && update-locale LANG=en_US.UTF-8
 ENV LANG=en_US.UTF-8
 RUN apt-get update \
     && apt-get install -y software-properties-common curl net-tools nginx
-RUN add-apt-repository -y ppa:bigbluebutton/support
-
-RUN apt-get update \
+RUN add-apt-repository -y ppa:rmescandon/yq \
+    && apt-get update \
     && apt-get install -y yq
 RUN curl -sL https://ubuntu.bigbluebutton.org/repo/bigbluebutton.asc | apt-key add - \
-    && echo "deb https://ubuntu.bigbluebutton.org/focal-260 bigbluebutton-focal main" >/etc/apt/sources.list.d/bigbluebutton.list
+    && echo "deb https://ubuntu.bigbluebutton.org/jammy-300 bigbluebutton-jammy main" >/etc/apt/sources.list.d/bigbluebutton.list
 RUN useradd --system --user-group --home-dir /var/bigbluebutton bigbluebutton
 RUN touch /.dockerenv
 RUN apt-get update \