Skip to content

Commit

Permalink
Switch to f41
Browse files Browse the repository at this point in the history
  • Loading branch information
philn committed Oct 19, 2024
1 parent 13bc76a commit d1ca334
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 11 deletions.
12 changes: 5 additions & 7 deletions Containerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM registry.fedoraproject.org/fedora-toolbox:40
FROM registry.fedoraproject.org/fedora-toolbox:41

ENV NAME=gst-dev VERSION=40
ENV NAME=gst-dev VERSION=41

ENV RUSTUP_HOME=/usr/local/rustup \
CARGO_HOME=/usr/local/cargo \
Expand Down Expand Up @@ -31,7 +31,7 @@ RUN dnf -y remove mesa-va-drivers
RUN dnf -y install mesa-va-drivers-freeworld

# Install the dependencies of gstreamer
RUN dnf builddep -y --allowerasing --skip-broken gstreamer1 \
RUN dnf builddep -y --allowerasing gstreamer1 \
gstreamer1-plugins-base \
gstreamer1-plugins-good \
gstreamer1-plugins-good-extras \
Expand All @@ -40,7 +40,6 @@ RUN dnf builddep -y --allowerasing --skip-broken gstreamer1 \
gstreamer1-plugins-bad-free \
gstreamer1-plugins-bad-free-extras \
gstreamer1-plugins-bad-freeworld \
gstreamer1-libav \
gstreamer1-rtsp-server


Expand All @@ -66,16 +65,15 @@ RUN git clone https://gitlab.freedesktop.org/gstreamer/gst-indent.git && \
rm -fr indent-build gst-indent

# Install Rust
ENV RUSTUP_VERSION=1.27.0
ENV RUST_VERSION=1.76.0
ENV RUSTUP_VERSION=1.27.1
ENV RUST_VERSION=1.81.0
ENV RUST_ARCH="x86_64-unknown-linux-gnu"
ENV RUSTUP_URL=https://static.rust-lang.org/rustup/archive/$RUSTUP_VERSION/$RUST_ARCH/rustup-init
RUN wget $RUSTUP_URL

RUN chmod +x rustup-init
RUN ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION
RUN rm rustup-init
RUN chmod -R a+w $RUSTUP_HOME $CARGO_HOME

RUN rustup --version
RUN cargo --version
Expand Down
2 changes: 1 addition & 1 deletion gst-bx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import subprocess

CONTAINER_PATH="localhost"
IMAGE_NAME="gst-dev-f"
CONTAINER_VERSION=40
CONTAINER_VERSION=41

def run(*args, capture_output=True):
cmdline = args
Expand Down
4 changes: 2 additions & 2 deletions justfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

tag := "gst-dev:f40"
tag := "gst-dev:f41"
default_registry := "ghcr.io/philn"
default_archive := "gst-dev-container.tar"

build:
podman pull registry.fedoraproject.org/fedora-toolbox:40
podman pull registry.fedoraproject.org/fedora-toolbox:41
podman build -t {{tag}} .

push registry=default_registry:
Expand Down
1 change: 0 additions & 1 deletion packages
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ mesa-libd3d
mesa-libd3d-devel
mesa-libgbm
mesa-libgbm-devel
mesa-omx-drivers
mesa-vulkan-drivers
mold
mono-devel
Expand Down

0 comments on commit d1ca334

Please sign in to comment.