Skip to content

Commit e971fdc

Browse files
author
Markus Perl
committed
Multiple packages updated
1 parent 3065a61 commit e971fdc

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

build-ffmpeg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,7 @@ if ! $DISABLE_LV2 ; then
785785
fi
786786
if build "lilv" "0.24.16"; then
787787
download "https://gitlab.com/lv2/lilv/-/archive/v$CURRENT_PACKAGE_VERSION/lilv-v$CURRENT_PACKAGE_VERSION.tar.gz" "lilv-v$CURRENT_PACKAGE_VERSION.tar.gz"
788-
execute meson build --prefix="${WORKSPACE}" --buildtype=release --default-library=static --libdir="${WORKSPACE}"/lib
788+
execute meson build --prefix="${WORKSPACE}" --buildtype=release --default-library=static --libdir="${WORKSPACE}"/lib -Dcpp_std=c++11
789789
execute ninja -C build
790790
execute ninja -C build install
791791
build_done "lilv" $CURRENT_PACKAGE_VERSION

cuda-ubuntu.dockerfile

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG CUDAVER=12.6.2
1+
ARG CUDAVER=12.9.0
22
ARG UBUNTUVER=22.04
33

44
FROM nvidia/cuda:${CUDAVER}-devel-ubuntu${UBUNTUVER} AS build
@@ -7,18 +7,23 @@ ENV DEBIAN_FRONTEND=noninteractive
77
ENV NVIDIA_VISIBLE_DEVICES=all
88
ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility,video
99

10-
RUN apt-get update \
11-
&& apt-get -y --no-install-recommends install build-essential curl ca-certificates libva-dev \
12-
python3 python-is-python3 ninja-build meson git curl \
13-
&& apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* \
14-
&& update-ca-certificates
15-
16-
# build and move deviceQuery to /usr/bin
17-
RUN mkdir -p /code && \
18-
git clone --depth 1 https://github.com/NVIDIA/cuda-samples.git /code/cuda-samples && \
19-
cd /code/cuda-samples/Samples/1_Utilities/deviceQuery && \
20-
make && \
21-
mv deviceQuery /usr/local/bin
10+
# Update package lists
11+
RUN apt-get update
12+
# Install required packages
13+
RUN apt-get -y --no-install-recommends install build-essential curl ca-certificates libva-dev \
14+
python3 python-is-python3 ninja-build meson git curl
15+
# Clean up package cache and temporary files
16+
RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
17+
# Update CA certificates
18+
RUN update-ca-certificates
19+
# Create code directory
20+
RUN mkdir -p /code
21+
# Clone CUDA samples repository
22+
RUN git clone --depth 1 https://github.com/NVIDIA/cuda-samples.git /code/cuda-samples
23+
# Build deviceQuery
24+
RUN cd /code/cuda-samples/Samples/1_Utilities/deviceQuery && make
25+
# Move deviceQuery binary to path
26+
RUN mv /code/cuda-samples/Samples/1_Utilities/deviceQuery/deviceQuery /usr/local/bin
2227

2328
WORKDIR /app
2429
COPY ./build-ffmpeg /app/build-ffmpeg

0 commit comments

Comments
 (0)