Skip to content

Commit

Permalink
bring nvidia2004 up2date with nvidia-headers and cuda containers (#315)
Browse files Browse the repository at this point in the history 
* bring nvidia2004 up2date with nvidia-headers and cuda containers
  • Loading branch information
@csreynolds
csreynolds authored Sep 18, 2021
1 parent 3736908 commit 4a6565c
Show file tree
Hide file tree
Showing 17 changed files with 80 additions and 64 deletions.
8 changes: 5 additions & 3 deletions docker-images/3.3/nvidia2004/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,21 @@
#
#

FROM nvidia/cuda:10.2-devel-ubuntu18.04 AS devel-base
FROM nvidia/cuda:11.4.1-devel-ubuntu20.04 AS devel-base

ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
ENV DEBIAN_FRONTEND=nonintercative
WORKDIR /tmp/workdir

RUN apt-get -yqq update && \
apt-get install -yq --no-install-recommends ca-certificates expat libgomp1 && \
apt-get autoremove -y && \
apt-get clean -y

FROM nvidia/cuda:10.2-runtime-ubuntu18.04 AS runtime-base
FROM nvidia/cuda:11.4.1-runtime-ubuntu20.04 AS runtime-base

ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
ENV DEBIAN_FRONTEND=nonintercative
WORKDIR /tmp/workdir

RUN apt-get -yqq update && \
Expand All @@ -29,7 +31,7 @@ RUN apt-get -yqq update && \

FROM devel-base as build

ENV NVIDIA_HEADERS_VERSION=9.1.23.1
ENV NVIDIA_HEADERS_VERSION=11.1.5.0

ENV FFMPEG_VERSION=3.3.9 \
AOM_VERSION=v1.0.0 \
Expand Down
8 changes: 5 additions & 3 deletions docker-images/3.4/nvidia2004/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,21 @@
#
#

FROM nvidia/cuda:10.2-devel-ubuntu18.04 AS devel-base
FROM nvidia/cuda:11.4.1-devel-ubuntu20.04 AS devel-base

ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
ENV DEBIAN_FRONTEND=nonintercative
WORKDIR /tmp/workdir

RUN apt-get -yqq update && \
apt-get install -yq --no-install-recommends ca-certificates expat libgomp1 && \
apt-get autoremove -y && \
apt-get clean -y

FROM nvidia/cuda:10.2-runtime-ubuntu18.04 AS runtime-base
FROM nvidia/cuda:11.4.1-runtime-ubuntu20.04 AS runtime-base

ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
ENV DEBIAN_FRONTEND=nonintercative
WORKDIR /tmp/workdir

RUN apt-get -yqq update && \
Expand All @@ -29,7 +31,7 @@ RUN apt-get -yqq update && \

FROM devel-base as build

ENV NVIDIA_HEADERS_VERSION=9.1.23.1
ENV NVIDIA_HEADERS_VERSION=11.1.5.0

ENV FFMPEG_VERSION=3.4.8 \
AOM_VERSION=v1.0.0 \
Expand Down
8 changes: 5 additions & 3 deletions docker-images/4.0/nvidia2004/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,21 @@
#
#

FROM nvidia/cuda:10.2-devel-ubuntu18.04 AS devel-base
FROM nvidia/cuda:11.4.1-devel-ubuntu20.04 AS devel-base

ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
ENV DEBIAN_FRONTEND=nonintercative
WORKDIR /tmp/workdir

RUN apt-get -yqq update && \
apt-get install -yq --no-install-recommends ca-certificates expat libgomp1 && \
apt-get autoremove -y && \
apt-get clean -y

FROM nvidia/cuda:10.2-runtime-ubuntu18.04 AS runtime-base
FROM nvidia/cuda:11.4.1-runtime-ubuntu20.04 AS runtime-base

ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
ENV DEBIAN_FRONTEND=nonintercative
WORKDIR /tmp/workdir

RUN apt-get -yqq update && \
Expand All @@ -29,7 +31,7 @@ RUN apt-get -yqq update && \

FROM devel-base as build

ENV NVIDIA_HEADERS_VERSION=9.1.23.1
ENV NVIDIA_HEADERS_VERSION=11.1.5.0

ENV FFMPEG_VERSION=4.0.6 \
AOM_VERSION=v1.0.0 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/4.1/alpine312/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ FROM base AS build

WORKDIR /tmp/workdir

ENV FFMPEG_VERSION=4.1.6 \
ENV FFMPEG_VERSION=4.1.7 \
AOM_VERSION=v1.0.0 \
FDKAAC_VERSION=0.1.5 \
FONTCONFIG_VERSION=2.12.4 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/4.1/centos7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ FROM base AS build

WORKDIR /tmp/workdir

ENV FFMPEG_VERSION=4.1.6 \
ENV FFMPEG_VERSION=4.1.7 \
AOM_VERSION=v1.0.0 \
FDKAAC_VERSION=0.1.5 \
FONTCONFIG_VERSION=2.12.4 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/4.1/centos8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ FROM base AS build

WORKDIR /tmp/workdir

ENV FFMPEG_VERSION=4.1.6 \
ENV FFMPEG_VERSION=4.1.7 \
AOM_VERSION=v1.0.0 \
FDKAAC_VERSION=0.1.5 \
FONTCONFIG_VERSION=2.12.4 \
Expand Down
10 changes: 6 additions & 4 deletions docker-images/4.1/nvidia2004/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,21 @@
#
#

FROM nvidia/cuda:10.2-devel-ubuntu18.04 AS devel-base
FROM nvidia/cuda:11.4.1-devel-ubuntu20.04 AS devel-base

ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
ENV DEBIAN_FRONTEND=nonintercative
WORKDIR /tmp/workdir

RUN apt-get -yqq update && \
apt-get install -yq --no-install-recommends ca-certificates expat libgomp1 && \
apt-get autoremove -y && \
apt-get clean -y

FROM nvidia/cuda:10.2-runtime-ubuntu18.04 AS runtime-base
FROM nvidia/cuda:11.4.1-runtime-ubuntu20.04 AS runtime-base

ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
ENV DEBIAN_FRONTEND=nonintercative
WORKDIR /tmp/workdir

RUN apt-get -yqq update && \
Expand All @@ -29,9 +31,9 @@ RUN apt-get -yqq update && \

FROM devel-base as build

ENV NVIDIA_HEADERS_VERSION=9.1.23.1
ENV NVIDIA_HEADERS_VERSION=11.1.5.0

ENV FFMPEG_VERSION=4.1.6 \
ENV FFMPEG_VERSION=4.1.7 \
AOM_VERSION=v1.0.0 \
FDKAAC_VERSION=0.1.5 \
FONTCONFIG_VERSION=2.12.4 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/4.1/scratch312/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM alpine:3.12 AS build

WORKDIR /tmp/workdir

ENV FFMPEG_VERSION=4.1.6 \
ENV FFMPEG_VERSION=4.1.7 \
AOM_VERSION=v1.0.0 \
FDKAAC_VERSION=0.1.5 \
FONTCONFIG_VERSION=2.12.4 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/4.1/ubuntu1804/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN apt-get -yqq update && \

FROM base as build

ENV FFMPEG_VERSION=4.1.6 \
ENV FFMPEG_VERSION=4.1.7 \
AOM_VERSION=v1.0.0 \
FDKAAC_VERSION=0.1.5 \
FONTCONFIG_VERSION=2.12.4 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/4.1/ubuntu2004/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN apt-get -yqq update && \

FROM base as build

ENV FFMPEG_VERSION=4.1.6 \
ENV FFMPEG_VERSION=4.1.7 \
AOM_VERSION=v1.0.0 \
FDKAAC_VERSION=0.1.5 \
FONTCONFIG_VERSION=2.12.4 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/4.1/vaapi2004/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN apt-get -yqq update && \

FROM base as build

ENV FFMPEG_VERSION=4.1.6 \
ENV FFMPEG_VERSION=4.1.7 \
AOM_VERSION=v1.0.0 \
FDKAAC_VERSION=0.1.5 \
FONTCONFIG_VERSION=2.12.4 \
Expand Down
8 changes: 5 additions & 3 deletions docker-images/4.2/nvidia2004/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,21 @@
#
#

FROM nvidia/cuda:10.2-devel-ubuntu18.04 AS devel-base
FROM nvidia/cuda:11.4.1-devel-ubuntu20.04 AS devel-base

ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
ENV DEBIAN_FRONTEND=nonintercative
WORKDIR /tmp/workdir

RUN apt-get -yqq update && \
apt-get install -yq --no-install-recommends ca-certificates expat libgomp1 && \
apt-get autoremove -y && \
apt-get clean -y

FROM nvidia/cuda:10.2-runtime-ubuntu18.04 AS runtime-base
FROM nvidia/cuda:11.4.1-runtime-ubuntu20.04 AS runtime-base

ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
ENV DEBIAN_FRONTEND=nonintercative
WORKDIR /tmp/workdir

RUN apt-get -yqq update && \
Expand All @@ -29,7 +31,7 @@ RUN apt-get -yqq update && \

FROM devel-base as build

ENV NVIDIA_HEADERS_VERSION=9.1.23.1
ENV NVIDIA_HEADERS_VERSION=11.1.5.0

ENV FFMPEG_VERSION=4.2.4 \
AOM_VERSION=v1.0.0 \
Expand Down
8 changes: 5 additions & 3 deletions docker-images/4.3/nvidia2004/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,21 @@
#
#

FROM nvidia/cuda:10.2-devel-ubuntu18.04 AS devel-base
FROM nvidia/cuda:11.4.1-devel-ubuntu20.04 AS devel-base

ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
ENV DEBIAN_FRONTEND=nonintercative
WORKDIR /tmp/workdir

RUN apt-get -yqq update && \
apt-get install -yq --no-install-recommends ca-certificates expat libgomp1 && \
apt-get autoremove -y && \
apt-get clean -y

FROM nvidia/cuda:10.2-runtime-ubuntu18.04 AS runtime-base
FROM nvidia/cuda:11.4.1-runtime-ubuntu20.04 AS runtime-base

ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
ENV DEBIAN_FRONTEND=nonintercative
WORKDIR /tmp/workdir

RUN apt-get -yqq update && \
Expand All @@ -29,7 +31,7 @@ RUN apt-get -yqq update && \

FROM devel-base as build

ENV NVIDIA_HEADERS_VERSION=9.1.23.1
ENV NVIDIA_HEADERS_VERSION=11.1.5.0

ENV FFMPEG_VERSION=4.3.2 \
AOM_VERSION=v1.0.0 \
Expand Down
8 changes: 5 additions & 3 deletions docker-images/4.4/nvidia2004/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,21 @@
#
#

FROM nvidia/cuda:10.2-devel-ubuntu18.04 AS devel-base
FROM nvidia/cuda:11.4.1-devel-ubuntu20.04 AS devel-base

ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
ENV DEBIAN_FRONTEND=nonintercative
WORKDIR /tmp/workdir

RUN apt-get -yqq update && \
apt-get install -yq --no-install-recommends ca-certificates expat libgomp1 && \
apt-get autoremove -y && \
apt-get clean -y

FROM nvidia/cuda:10.2-runtime-ubuntu18.04 AS runtime-base
FROM nvidia/cuda:11.4.1-runtime-ubuntu20.04 AS runtime-base

ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
ENV DEBIAN_FRONTEND=nonintercative
WORKDIR /tmp/workdir

RUN apt-get -yqq update && \
Expand All @@ -29,7 +31,7 @@ RUN apt-get -yqq update && \

FROM devel-base as build

ENV NVIDIA_HEADERS_VERSION=9.1.23.1
ENV NVIDIA_HEADERS_VERSION=11.1.5.0

ENV FFMPEG_VERSION=4.4 \
AOM_VERSION=v1.0.0 \
Expand Down
32 changes: 16 additions & 16 deletions docker-images/azure-jobs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,73 +277,73 @@ jobs:
ISPARENT: True


ubuntu1804_4.1.6:
ubuntu1804_4.1.7:
MAJOR_VERSION: 4
VERSION: 4.1
LONG_VERSION: 4.1.6
LONG_VERSION: 4.1.7
VARIANT: ubuntu1804
PARENT: ubuntu
ISPARENT: False


ubuntu2004_4.1.6:
ubuntu2004_4.1.7:
MAJOR_VERSION: 4
VERSION: 4.1
LONG_VERSION: 4.1.6
LONG_VERSION: 4.1.7
VARIANT: ubuntu2004
PARENT: ubuntu
ISPARENT: True


alpine312_4.1.6:
alpine312_4.1.7:
MAJOR_VERSION: 4
VERSION: 4.1
LONG_VERSION: 4.1.6
LONG_VERSION: 4.1.7
VARIANT: alpine312
PARENT: alpine
ISPARENT: True


centos7_4.1.6:
centos7_4.1.7:
MAJOR_VERSION: 4
VERSION: 4.1
LONG_VERSION: 4.1.6
LONG_VERSION: 4.1.7
VARIANT: centos7
PARENT: centos
ISPARENT: False


centos8_4.1.6:
centos8_4.1.7:
MAJOR_VERSION: 4
VERSION: 4.1
LONG_VERSION: 4.1.6
LONG_VERSION: 4.1.7
VARIANT: centos8
PARENT: centos
ISPARENT: True


scratch312_4.1.6:
scratch312_4.1.7:
MAJOR_VERSION: 4
VERSION: 4.1
LONG_VERSION: 4.1.6
LONG_VERSION: 4.1.7
VARIANT: scratch312
PARENT: scratch
ISPARENT: True


vaapi2004_4.1.6:
vaapi2004_4.1.7:
MAJOR_VERSION: 4
VERSION: 4.1
LONG_VERSION: 4.1.6
LONG_VERSION: 4.1.7
VARIANT: vaapi2004
PARENT: vaapi
ISPARENT: True


nvidia2004_4.1.6:
nvidia2004_4.1.7:
MAJOR_VERSION: 4
VERSION: 4.1
LONG_VERSION: 4.1.6
LONG_VERSION: 4.1.7
VARIANT: nvidia2004
PARENT: nvidia
ISPARENT: True
Expand Down
Loading

0 comments on commit 4a6565c

Please sign in to comment.