Skip to content

Commit

Permalink
prepare 4.2 (#207)
Browse files Browse the repository at this point in the history
  • Loading branch information
@rottj006
rottj006 authored Jan 8, 2020
1 parent fc9d80c commit 4e020b1
Show file tree
Hide file tree
Showing 15 changed files with 61 additions and 61 deletions.
72 changes: 36 additions & 36 deletions azure-pipelines.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,112 +28,112 @@ jobs:
snapshot_nvidia:
VERSION: snapshot
VARIANT: nvidia
4_2_1_ubuntu:
4_2_ubuntu:
VERSION: 4.2
VARIANT: ubuntu
4_2_1_alpine:
4_2_alpine:
VERSION: 4.2
VARIANT: alpine
4_2_1_centos:
4_2_centos:
VERSION: 4.2
VARIANT: centos
4_2_1_scratch:
4_2_scratch:
VERSION: 4.2
VARIANT: scratch
4_2_1_vaapi:
4_2_vaapi:
VERSION: 4.2
VARIANT: vaapi
4_2_1_nvidia:
4_2_nvidia:
VERSION: 4.2
VARIANT: nvidia
4_1_4_ubuntu:
4_1_ubuntu:
VERSION: 4.1
VARIANT: ubuntu
4_1_4_alpine:
4_1_alpine:
VERSION: 4.1
VARIANT: alpine
4_1_4_centos:
4_1_centos:
VERSION: 4.1
VARIANT: centos
4_1_4_scratch:
4_1_scratch:
VERSION: 4.1
VARIANT: scratch
4_1_4_vaapi:
4_1_vaapi:
VERSION: 4.1
VARIANT: vaapi
4_1_4_nvidia:
4_1_nvidia:
VERSION: 4.1
VARIANT: nvidia
4_0_5_ubuntu:
4_0_ubuntu:
VERSION: 4.0
VARIANT: ubuntu
4_0_5_alpine:
4_0_alpine:
VERSION: 4.0
VARIANT: alpine
4_0_5_centos:
4_0_centos:
VERSION: 4.0
VARIANT: centos
4_0_5_scratch:
4_0_scratch:
VERSION: 4.0
VARIANT: scratch
4_0_5_vaapi:
4_0_vaapi:
VERSION: 4.0
VARIANT: vaapi
4_0_5_nvidia:
4_0_nvidia:
VERSION: 4.0
VARIANT: nvidia
3_4_6_ubuntu:
3_4_ubuntu:
VERSION: 3.4
VARIANT: ubuntu
3_4_6_alpine:
3_4_alpine:
VERSION: 3.4
VARIANT: alpine
3_4_6_centos:
3_4_centos:
VERSION: 3.4
VARIANT: centos
3_4_6_scratch:
3_4_scratch:
VERSION: 3.4
VARIANT: scratch
3_4_6_vaapi:
3_4_vaapi:
VERSION: 3.4
VARIANT: vaapi
3_4_6_nvidia:
3_4_nvidia:
VERSION: 3.4
VARIANT: nvidia
3_3_9_ubuntu:
3_3_ubuntu:
VERSION: 3.3
VARIANT: ubuntu
3_3_9_alpine:
3_3_alpine:
VERSION: 3.3
VARIANT: alpine
3_3_9_centos:
3_3_centos:
VERSION: 3.3
VARIANT: centos
3_3_9_scratch:
3_3_scratch:
VERSION: 3.3
VARIANT: scratch
3_3_9_vaapi:
3_3_vaapi:
VERSION: 3.3
VARIANT: vaapi
3_3_9_nvidia:
3_3_nvidia:
VERSION: 3.3
VARIANT: nvidia
3_2_14_ubuntu:
3_2_ubuntu:
VERSION: 3.2
VARIANT: ubuntu
3_2_14_alpine:
3_2_alpine:
VERSION: 3.2
VARIANT: alpine
3_2_14_centos:
3_2_centos:
VERSION: 3.2
VARIANT: centos
3_2_14_scratch:
3_2_scratch:
VERSION: 3.2
VARIANT: scratch
3_2_14_vaapi:
3_2_vaapi:
VERSION: 3.2
VARIANT: vaapi
3_2_14_nvidia:
3_2_nvidia:
VERSION: 3.2
VARIANT: nvidia
steps:
Expand Down
2 changes: 1 addition & 1 deletion docker-images/3.4/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib
ARG PREFIX=/opt/ffmpeg
ARG MAKEFLAGS="-j2"

ENV FFMPEG_VERSION=3.4.6 \
ENV FFMPEG_VERSION=3.4.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/3.4/centos/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib
ARG PREFIX=/opt/ffmpeg
ARG MAKEFLAGS="-j2"

ENV FFMPEG_VERSION=3.4.6 \
ENV FFMPEG_VERSION=3.4.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/3.4/nvidia/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/ffmpeg/lib"
ARG PREFIX=/opt/ffmpeg
ARG MAKEFLAGS="-j12"

ENV FFMPEG_VERSION=3.4.6 \
ENV FFMPEG_VERSION=3.4.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/3.4/scratch/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib
ARG PREFIX=/opt/ffmpeg
ARG MAKEFLAGS="-j2"

ENV FFMPEG_VERSION=3.4.6 \
ENV FFMPEG_VERSION=3.4.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/3.4/ubuntu/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib
ARG PREFIX=/opt/ffmpeg
ARG MAKEFLAGS="-j2"

ENV FFMPEG_VERSION=3.4.6 \
ENV FFMPEG_VERSION=3.4.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/3.4/vaapi/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib
ARG PREFIX=/opt/ffmpeg
ARG MAKEFLAGS="-j2"

ENV FFMPEG_VERSION=3.4.6 \
ENV FFMPEG_VERSION=3.4.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.2/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib
ARG PREFIX=/opt/ffmpeg
ARG MAKEFLAGS="-j2"

ENV FFMPEG_VERSION=4.2.1 \
ENV FFMPEG_VERSION=4.2.2 \
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.2/centos/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib
ARG PREFIX=/opt/ffmpeg
ARG MAKEFLAGS="-j2"

ENV FFMPEG_VERSION=4.2.1 \
ENV FFMPEG_VERSION=4.2.2 \
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.2/nvidia/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/ffmpeg/lib"
ARG PREFIX=/opt/ffmpeg
ARG MAKEFLAGS="-j12"

ENV FFMPEG_VERSION=4.2.1 \
ENV FFMPEG_VERSION=4.2.2 \
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.2/scratch/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib
ARG PREFIX=/opt/ffmpeg
ARG MAKEFLAGS="-j2"

ENV FFMPEG_VERSION=4.2.1 \
ENV FFMPEG_VERSION=4.2.2 \
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.2/ubuntu/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib
ARG PREFIX=/opt/ffmpeg
ARG MAKEFLAGS="-j2"

ENV FFMPEG_VERSION=4.2.1 \
ENV FFMPEG_VERSION=4.2.2 \
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.2/vaapi/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib
ARG PREFIX=/opt/ffmpeg
ARG MAKEFLAGS="-j2"

ENV FFMPEG_VERSION=4.2.1 \
ENV FFMPEG_VERSION=4.2.2 \
AOM_VERSION=v1.0.0 \
FDKAAC_VERSION=0.1.5 \
FONTCONFIG_VERSION=2.12.4 \
Expand Down
24 changes: 12 additions & 12 deletions docker-images/gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,37 +35,37 @@ snapshot-nvidia:
VERSION: "snapshot"
VARIANT: nvidia

4.2.1-ubuntu:
4.2.2-ubuntu:
extends: .docker
variables:
VERSION: "4.2"
VARIANT: ubuntu

4.2.1-alpine:
4.2.2-alpine:
extends: .docker
variables:
VERSION: "4.2"
VARIANT: alpine

4.2.1-centos:
4.2.2-centos:
extends: .docker
variables:
VERSION: "4.2"
VARIANT: centos

4.2.1-scratch:
4.2.2-scratch:
extends: .docker
variables:
VERSION: "4.2"
VARIANT: scratch

4.2.1-vaapi:
4.2.2-vaapi:
extends: .docker
variables:
VERSION: "4.2"
VARIANT: vaapi

4.2.1-nvidia:
4.2.2-nvidia:
extends: .docker
variables:
VERSION: "4.2"
Expand Down Expand Up @@ -143,37 +143,37 @@ snapshot-nvidia:
VERSION: "4.0"
VARIANT: nvidia

3.4.6-ubuntu:
3.4.7-ubuntu:
extends: .docker
variables:
VERSION: "3.4"
VARIANT: ubuntu

3.4.6-alpine:
3.4.7-alpine:
extends: .docker
variables:
VERSION: "3.4"
VARIANT: alpine

3.4.6-centos:
3.4.7-centos:
extends: .docker
variables:
VERSION: "3.4"
VARIANT: centos

3.4.6-scratch:
3.4.7-scratch:
extends: .docker
variables:
VERSION: "3.4"
VARIANT: scratch

3.4.6-vaapi:
3.4.7-vaapi:
extends: .docker
variables:
VERSION: "3.4"
VARIANT: vaapi

3.4.6-nvidia:
3.4.7-nvidia:
extends: .docker
variables:
VERSION: "3.4"
Expand Down
2 changes: 1 addition & 1 deletion update.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@

azure.append(
" %s_%s:\n VERSION: %s\n VARIANT: %s"
% (version.replace(".", "_"), variant, short_version, variant)
% (short_version.replace(".", "_"), variant, short_version, variant)
)

with open("templates/Dockerfile-env", "r") as tmpfile:
Expand Down

0 comments on commit 4e020b1

Please sign in to comment.