Docker: Update build image with final OCIOv2, Qt 5.15.2, OTIO, Crashpad (#1489)

* Add missing xcb-util-* packages. Qt's libqxcb.so seems to require them in the newer Qt version

* Adjust breakpad install prefix to match CMake change

* Add build script for Olive for quick testing

* .n in CI image actually stands for image revision

* skipping the CI is now supported natively by GitHub Actions
This commit is contained in:
Simran
2021-03-25 03:59:42 +01:00
committed by GitHub
parent 2d420decf0
commit cc317a8b1a
16 changed files with 115 additions and 78 deletions
+5 -3
View File
@@ -9,6 +9,7 @@ ARG CI_COMMON_VERSION=2
ARG FFMPEG_VERSION=4.2.4
ARG NASM_VERSION=2.15.03
ARG YASM_VERSION=1.3.0
ARG AOM_VERSION=v2.0.1
ARG X265_VERSION=3.4
ARG OGG_VERSION=1.3.4
ARG OPUS_VERSION=1.3.1
@@ -20,7 +21,7 @@ ARG LAME_VERSION=3.100
ARG XVID_VERSION=1.3.5
ARG OPENJPEG_VERSION=2.3.1
ARG LIBPNG_VERSION=1.6.31
# TODO: Make version of x264, x265 and libvpx selectable?
# TODO: Make version of x264 selectable?
ARG NUM_JOBS=2
FROM ${OLIVE_ORG}/ci-common:${CI_COMMON_VERSION} as ci-ffmpeg
@@ -30,6 +31,7 @@ ARG CI_COMMON_VERSION
ARG FFMPEG_VERSION
ARG NASM_VERSION
ARG YASM_VERSION
ARG AOM_VERSION
ARG X265_VERSION
ARG OGG_VERSION
ARG OPUS_VERSION
@@ -41,8 +43,7 @@ ARG LAME_VERSION
ARG XVID_VERSION
ARG OPENJPEG_VERSION
ARG LIBPNG_VERSION
# TODO: Make version of x264, x265 and libvpx selectable?
ARG NUM_JOBS=2
ARG NUM_JOBS
LABEL maintainer="olivevideoeditor@gmail.com"
LABEL org.opencontainers.image.name="$OLIVE_ORG/ci-ffmpeg"
@@ -61,6 +62,7 @@ ENV OLIVE_ORG=${OLIVE_ORG} \
FFMPEG_VERSION=${FFMPEG_VERSION} \
NASM_VERSION=${NASM_VERSION} \
YASM_VERSION=${YASM_VERSION} \
AOM_VERSION=${AOM_VERSION} \
X265_VERSION=${X265_VERSION} \
OGG_VERSION=${OGG_VERSION} \
OPUS_VERSION=${OPUS_VERSION} \