Merge branch 'master' into dependabot/bundler/net-imap-0.5.6

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 \

Gemfile.lock

@@ -130,7 +130,7 @@ GEM
       net-smtp
     marcel (1.0.4)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.7)
+    mini_portile2 (2.8.8)
     minitest (5.25.1)
     minitest-stub_any_instance (1.0.3)
     msgpack (1.7.0)
@@ -144,7 +144,7 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.16.7)
+    nokogiri (1.18.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     parallel (1.22.1)
@@ -157,7 +157,7 @@ GEM
     puma (6.4.3)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.1.8)
+    rack (3.1.10)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)

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 \