Skip to content

Commit

Permalink
v4.3.7 & v5.1.5 (#396)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jrottenberg
jrottenberg authored Jul 8, 2024
1 parent 06c36cb commit 17b01dc
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion docker-images/4.3/nvidia2204/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ FROM devel-base as build

ENV NVIDIA_HEADERS_VERSION=11.1.5.3

ENV FFMPEG_VERSION=4.3.6 \
ENV FFMPEG_VERSION=4.3.7 \
AOM_VERSION=v3.8.1 \
CHROMAPRINT_VERSION=1.5.0 \
FDKAAC_VERSION=0.1.5 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/4.3/ubuntu2204/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.3.6 \
ENV FFMPEG_VERSION=4.3.7 \
AOM_VERSION=v3.8.1 \
CHROMAPRINT_VERSION=1.5.0 \
FDKAAC_VERSION=0.1.5 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/4.3/vaapi2204/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.3.6 \
ENV FFMPEG_VERSION=4.3.7 \
AOM_VERSION=v3.8.1 \
CHROMAPRINT_VERSION=1.5.0 \
FDKAAC_VERSION=0.1.5 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/5.1/alpine313/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=5.1.4 \
ENV FFMPEG_VERSION=5.1.5 \
AOM_VERSION=v3.8.1 \
CHROMAPRINT_VERSION=1.5.0 \
FDKAAC_VERSION=0.1.5 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/5.1/nvidia2204/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ FROM devel-base as build

ENV NVIDIA_HEADERS_VERSION=11.1.5.3

ENV FFMPEG_VERSION=5.1.4 \
ENV FFMPEG_VERSION=5.1.5 \
AOM_VERSION=v3.8.1 \
CHROMAPRINT_VERSION=1.5.0 \
FDKAAC_VERSION=0.1.5 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/5.1/ubuntu2204/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=5.1.4 \
ENV FFMPEG_VERSION=5.1.5 \
AOM_VERSION=v3.8.1 \
CHROMAPRINT_VERSION=1.5.0 \
FDKAAC_VERSION=0.1.5 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/5.1/vaapi2204/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=5.1.4 \
ENV FFMPEG_VERSION=5.1.5 \
AOM_VERSION=v3.8.1 \
CHROMAPRINT_VERSION=1.5.0 \
FDKAAC_VERSION=0.1.5 \
Expand Down
28 changes: 14 additions & 14 deletions docker-images/azure-jobs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,37 +116,37 @@ jobs:
ISPARENT: True


ubuntu2204_5.1.4:
ubuntu2204_5.1.5:
MAJOR_VERSION: 5
VERSION: 5.1
LONG_VERSION: 5.1.4
LONG_VERSION: 5.1.5
VARIANT: ubuntu2204
PARENT: ubuntu
ISPARENT: True


alpine313_5.1.4:
alpine313_5.1.5:
MAJOR_VERSION: 5
VERSION: 5.1
LONG_VERSION: 5.1.4
LONG_VERSION: 5.1.5
VARIANT: alpine313
PARENT: alpine
ISPARENT: True


vaapi2204_5.1.4:
vaapi2204_5.1.5:
MAJOR_VERSION: 5
VERSION: 5.1
LONG_VERSION: 5.1.4
LONG_VERSION: 5.1.5
VARIANT: vaapi2204
PARENT: vaapi
ISPARENT: True


nvidia2204_5.1.4:
nvidia2204_5.1.5:
MAJOR_VERSION: 5
VERSION: 5.1
LONG_VERSION: 5.1.4
LONG_VERSION: 5.1.5
VARIANT: nvidia2204
PARENT: nvidia
ISPARENT: True
Expand Down Expand Up @@ -197,28 +197,28 @@ jobs:
ISPARENT: True


ubuntu2204_4.3.6:
ubuntu2204_4.3.7:
MAJOR_VERSION: 4
VERSION: 4.3
LONG_VERSION: 4.3.6
LONG_VERSION: 4.3.7
VARIANT: ubuntu2204
PARENT: ubuntu
ISPARENT: True


vaapi2204_4.3.6:
vaapi2204_4.3.7:
MAJOR_VERSION: 4
VERSION: 4.3
LONG_VERSION: 4.3.6
LONG_VERSION: 4.3.7
VARIANT: vaapi2204
PARENT: vaapi
ISPARENT: True


nvidia2204_4.3.6:
nvidia2204_4.3.7:
MAJOR_VERSION: 4
VERSION: 4.3
LONG_VERSION: 4.3.6
LONG_VERSION: 4.3.7
VARIANT: nvidia2204
PARENT: nvidia
ISPARENT: True
Expand Down
28 changes: 14 additions & 14 deletions docker-images/gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,46 +138,46 @@ stages:
PARENT: "nvidia"
ISPARENT: "True"

5.1.4-ubuntu2204:
5.1.5-ubuntu2204:
extends: .docker
stage: ubuntu
variables:
MAJOR_VERSION: 5
VERSION: "5.1"
LONG_VERSION: "5.1.4"
LONG_VERSION: "5.1.5"
VARIANT: ubuntu2204
PARENT: "ubuntu"
ISPARENT: "True"

5.1.4-alpine313:
5.1.5-alpine313:
extends: .docker
stage: alpine
variables:
MAJOR_VERSION: 5
VERSION: "5.1"
LONG_VERSION: "5.1.4"
LONG_VERSION: "5.1.5"
VARIANT: alpine313
PARENT: "alpine"
ISPARENT: "True"

5.1.4-vaapi2204:
5.1.5-vaapi2204:
extends: .docker
stage: vaapi
variables:
MAJOR_VERSION: 5
VERSION: "5.1"
LONG_VERSION: "5.1.4"
LONG_VERSION: "5.1.5"
VARIANT: vaapi2204
PARENT: "vaapi"
ISPARENT: "True"

5.1.4-nvidia2204:
5.1.5-nvidia2204:
extends: .docker
stage: nvidia
variables:
MAJOR_VERSION: 5
VERSION: "5.1"
LONG_VERSION: "5.1.4"
LONG_VERSION: "5.1.5"
VARIANT: nvidia2204
PARENT: "nvidia"
ISPARENT: "True"
Expand Down Expand Up @@ -237,35 +237,35 @@ stages:
PARENT: "nvidia"
ISPARENT: "True"

4.3.6-ubuntu2204:
4.3.7-ubuntu2204:
extends: .docker
stage: ubuntu
variables:
MAJOR_VERSION: 4
VERSION: "4.3"
LONG_VERSION: "4.3.6"
LONG_VERSION: "4.3.7"
VARIANT: ubuntu2204
PARENT: "ubuntu"
ISPARENT: "True"

4.3.6-vaapi2204:
4.3.7-vaapi2204:
extends: .docker
stage: vaapi
variables:
MAJOR_VERSION: 4
VERSION: "4.3"
LONG_VERSION: "4.3.6"
LONG_VERSION: "4.3.7"
VARIANT: vaapi2204
PARENT: "vaapi"
ISPARENT: "True"

4.3.6-nvidia2204:
4.3.7-nvidia2204:
extends: .docker
stage: nvidia
variables:
MAJOR_VERSION: 4
VERSION: "4.3"
LONG_VERSION: "4.3.6"
LONG_VERSION: "4.3.7"
VARIANT: nvidia2204
PARENT: "nvidia"
ISPARENT: "True"
Expand Down

0 comments on commit 17b01dc

Please sign in to comment.