Skip to content

Commit

Permalink
ubuntu 24.04, gstreamer 1.24.5
Browse files Browse the repository at this point in the history
  • Loading branch information
frostbyte73 committed Jul 25, 2024
1 parent f18463a commit 86e44ca
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 25 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
2 changes: 1 addition & 1 deletion build/gstreamer/Dockerfile-prod-rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ENV PATH=/root/.cargo/bin:$PATH

COPY compile-rs /

RUN /compile-rs
RUN /compile-rs

FROM livekit/gstreamer:${GSTREAMER_VERSION}-prod-${TARGETARCH}

Expand Down
2 changes: 1 addition & 1 deletion build/gstreamer/install-dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,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
32 changes: 13 additions & 19 deletions magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
)

const (
gstVersion = "1.22.12"
gstVersion = "1.24.5"
libniceVersion = "0.1.21"
chromiumVersion = "125.0.6422.141"
dockerBuild = "docker build"
Expand Down Expand Up @@ -175,25 +175,19 @@ func BuildTemplate() error {
)
}

func BuildGStreamer() error {
return buildGstreamer(dockerBuild)
}
// base, dev, prod, prod-rs
func BuildGStreamer(build string) error {
command := fmt.Sprintf("%s"+
" --build-arg GSTREAMER_VERSION=%s"+
" --build-arg LIBNICE_VERSION=%s"+
" -t livekit/gstreamer:%s-%s"+
" -t livekit/gstreamer:%s-%s-%s"+
" -f build/gstreamer/Dockerfile-%s"+
" ./build/gstreamer",
dockerBuild, gstVersion, libniceVersion, gstVersion, build, gstVersion, build, runtime.GOARCH, build,
)

func buildGstreamer(cmd string) error {
commands := []string{"docker pull ubuntu:23.10"}
for _, build := range []string{"base", "dev", "prod", "prod-rs"} {
commands = append(commands, fmt.Sprintf("%s"+
" --build-arg GSTREAMER_VERSION=%s"+
" --build-arg LIBNICE_VERSION=%s"+
" -t livekit/gstreamer:%s-%s"+
" -t livekit/gstreamer:%s-%s-%s"+
" -f build/gstreamer/Dockerfile-%s"+
" ./build/gstreamer",
cmd, gstVersion, libniceVersion, gstVersion, build, gstVersion, build, runtime.GOARCH, build,
))
}

return mageutil.Run(context.Background(), commands...)
return mageutil.Run(context.Background(), command)
}

func Dotfiles() error {
Expand Down

0 comments on commit 86e44ca

Please sign in to comment.