From c0e88d95914d311ec0fb79d6a5924ad80fdb94bc Mon Sep 17 00:00:00 2001
From: David Colburn <xero73@gmail.com>
Date: Tue, 19 Nov 2024 21:45:25 -0800
Subject: [PATCH] ubuntu 24.04 (#811)

* 24.04

* cargo update time

* libvpx9
---
 build/gstreamer/Dockerfile-base      | 2 +-
 build/gstreamer/Dockerfile-dev       | 2 +-
 build/gstreamer/Dockerfile-prod      | 4 ++--
 build/gstreamer/compile-rs           | 3 ++-
 build/gstreamer/install-dependencies | 3 +--
 magefile.go                          | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build/gstreamer/Dockerfile-base b/build/gstreamer/Dockerfile-base
index 572ec89b..f8fc394b 100644
--- a/build/gstreamer/Dockerfile-base
+++ b/build/gstreamer/Dockerfile-base
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 ARG GSTREAMER_VERSION
 
diff --git a/build/gstreamer/Dockerfile-dev b/build/gstreamer/Dockerfile-dev
index 0da628ea..9ef5ba4c 100644
--- a/build/gstreamer/Dockerfile-dev
+++ b/build/gstreamer/Dockerfile-dev
@@ -11,7 +11,7 @@ COPY compile-rs /
 RUN /compile
 RUN /compile-rs
 
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 COPY install-dependencies /
 
diff --git a/build/gstreamer/Dockerfile-prod b/build/gstreamer/Dockerfile-prod
index c2899c9e..9b418a87 100644
--- a/build/gstreamer/Dockerfile-prod
+++ b/build/gstreamer/Dockerfile-prod
@@ -9,7 +9,7 @@ COPY compile /
 
 RUN /compile
 
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 RUN apt-get update && \
     apt-get dist-upgrade -y && \
@@ -97,7 +97,7 @@ RUN apt-get update && \
         libvo-aacenc0 \
         libvo-amrwbenc0 \
         libvorbis0a \
-        libvpx7 \
+        libvpx9 \
         libvulkan1 \
         libwavpack1 \
         libwebp7 \
diff --git a/build/gstreamer/compile-rs b/build/gstreamer/compile-rs
index 278129df..29f32022 100755
--- a/build/gstreamer/compile-rs
+++ b/build/gstreamer/compile-rs
@@ -6,7 +6,8 @@ for repo in gst-plugins-rs; do
 
   # strip binaries in debug mode
   mv Cargo.toml Cargo.toml.old
-  sed s,'\[profile.release\]','[profile.release]\nstrip="debuginfo"', Cargo.toml.old > Cargo.toml 
+  sed s,'\[profile.release\]','[profile.release]\nstrip="debuginfo"', Cargo.toml.old > Cargo.toml
+  cargo update -p time
 
   opts="-D prefix=/usr -D tests=disabled -D doc=disabled"
 
diff --git a/build/gstreamer/install-dependencies b/build/gstreamer/install-dependencies
index 5f7dec7d..7de4b86d 100755
--- a/build/gstreamer/install-dependencies
+++ b/build/gstreamer/install-dependencies
@@ -3,7 +3,6 @@ set -euxo pipefail
 
 export DEBIAN_FRONTEND=noninteractive
 
-sed -i 's/# deb-src/deb-src/g' /etc/apt/sources.list
 apt-get update
 apt-get dist-upgrade -y
 apt-get install -y --no-install-recommends \
@@ -121,7 +120,7 @@ apt-get clean
 rm -rf /var/lib/apt/lists/*
 
 # install rust
-curl -o install-rustup.sh --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs 
+curl -o install-rustup.sh --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs
 sh install-rustup.sh -y
 source "$HOME/.cargo/env"
 cargo install cargo-c
diff --git a/magefile.go b/magefile.go
index b38c6adc..6a3ac1d1 100644
--- a/magefile.go
+++ b/magefile.go
@@ -170,7 +170,7 @@ func Build() error {
 
 func BuildTemplate() error {
 	return mageutil.Run(context.Background(),
-		"docker pull ubuntu:22.04",
+		"docker pull ubuntu:24.04",
 		"docker build -t livekit/egress-templates -f ./build/template/Dockerfile .",
 	)
 }