From 40185f84393a65aa8d26be94ebf72ce255119b2a Mon Sep 17 00:00:00 2001 From: Jan Kessler Date: Tue, 9 Jul 2024 11:36:19 +0200 Subject: [PATCH 1/2] update yq & bbb-playback for BBB-3.0 --- Dockerfile | 9 ++++----- dockerfiles/v1/focal260-alpine | 9 ++++----- dockerfiles/v1/focal260-amazonlinux | 9 ++++----- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 01af719b..84047268 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 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 \ @@ -8,12 +8,11 @@ RUN apt-get update \ 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 \ diff --git a/dockerfiles/v1/focal260-alpine b/dockerfiles/v1/focal260-alpine index 2730ff91..7a8ce007 100644 --- a/dockerfiles/v1/focal260-alpine +++ b/dockerfiles/v1/focal260-alpine @@ -1,6 +1,6 @@ FROM alpine:3.17 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 \ @@ -8,12 +8,11 @@ RUN apt-get update \ 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 \ diff --git a/dockerfiles/v1/focal260-amazonlinux b/dockerfiles/v1/focal260-amazonlinux index 8ee3c408..38dfb6bb 100644 --- a/dockerfiles/v1/focal260-amazonlinux +++ b/dockerfiles/v1/focal260-amazonlinux @@ -1,6 +1,6 @@ FROM amazonlinux:2.0.20230320.0 AS amazonlinux -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 \ @@ -8,12 +8,11 @@ RUN apt-get update \ 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 \ From c904f03bbea7ad8fc727f7970ff31af762055dbd Mon Sep 17 00:00:00 2001 From: Jan Kessler Date: Wed, 10 Jul 2024 09:43:27 +0200 Subject: [PATCH 2/2] rename the dockerfiles w.r.t. the change focal260->jammy300 --- dockerfiles/v1/{focal260-alpine => jammy300-alpine} | 0 dockerfiles/v1/{focal260-amazonlinux => jammy300-amazonlinux} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename dockerfiles/v1/{focal260-alpine => jammy300-alpine} (100%) rename dockerfiles/v1/{focal260-amazonlinux => jammy300-amazonlinux} (100%) diff --git a/dockerfiles/v1/focal260-alpine b/dockerfiles/v1/jammy300-alpine similarity index 100% rename from dockerfiles/v1/focal260-alpine rename to dockerfiles/v1/jammy300-alpine diff --git a/dockerfiles/v1/focal260-amazonlinux b/dockerfiles/v1/jammy300-amazonlinux similarity index 100% rename from dockerfiles/v1/focal260-amazonlinux rename to dockerfiles/v1/jammy300-amazonlinux