Skip to content

Commit

Permalink
Merge branch 'main' into chrome-2404
Browse files Browse the repository at this point in the history
  • Loading branch information
frostbyte73 authored Nov 21, 2024
2 parents 2af5a24 + c0e88d9 commit ec2f224
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build/gstreamer/Dockerfile-base
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:22.04
FROM ubuntu:24.04

ARG GSTREAMER_VERSION

Expand Down
2 changes: 1 addition & 1 deletion build/gstreamer/Dockerfile-dev
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ COPY compile-rs /
RUN /compile
RUN /compile-rs

FROM ubuntu:22.04
FROM ubuntu:24.04

COPY install-dependencies /

Expand Down
4 changes: 2 additions & 2 deletions build/gstreamer/Dockerfile-prod
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down Expand Up @@ -97,7 +97,7 @@ RUN apt-get update && \
libvo-aacenc0 \
libvo-amrwbenc0 \
libvorbis0a \
libvpx7 \
libvpx9 \
libvulkan1 \
libwavpack1 \
libwebp7 \
Expand Down
3 changes: 2 additions & 1 deletion build/gstreamer/compile-rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
3 changes: 1 addition & 2 deletions build/gstreamer/install-dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 .",
)
}
Expand Down

0 comments on commit ec2f224

Please sign in to comment.