oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
docker/ci-common/Dockerfile
+7 -7
View File
@@ -1,5 +1,6 @@
# Copyright (C) 2020 Olive Team
# SPDX-License-Identifier: GPL-3.0-or-later
# Copyright (c) Contributors to the aswf-docker Project. All rights reserved.
# SPDX-License-Identifier: Apache-2.0 OR GPL-3.0-or-later
# Build image (default):
# docker build -t olivevideoeditor/ci-common:2 -f ci-common/Dockerfile .
@@ -8,7 +9,7 @@ ARG OLIVE_ORG=olivevideoeditor
ARG ASWF_PKG_ORG=aswftesting
ARG CI_COMMON_VERSION=2
ARG DTS_VERSION=9
ARG CMAKE_VERSION=3.17.3
ARG CMAKE_VERSION=3.19.3
FROM ${ASWF_PKG_ORG}/ci-package-clang:${CI_COMMON_VERSION} as ci-package-clang
FROM ${ASWF_PKG_ORG}/ci-package-ninja:${CI_COMMON_VERSION} as ci-package-ninja
@@ -31,21 +32,19 @@ LABEL org.opencontainers.image.licenses="GPL-3.0-or-later"
USER root
COPY scripts/${CI_COMMON_VERSION}/versions_common.sh \
scripts/common/install_yumpackages.sh \
COPY scripts/common/install_yumpackages.sh \
scripts/common/before_build.sh \
scripts/common/copy_new_files.sh \
/tmp/
RUN source /tmp/versions_common.sh && \
/tmp/install_yumpackages.sh
ENV DTS_VERSION=${DTS_VERSION}
RUN /tmp/install_yumpackages.sh
RUN mkdir /opt/olive
WORKDIR /opt/olive
ENV OLIVE_ORG=${OLIVE_ORG} \
CI_COMMON_VERSION=${CI_COMMON_VERSION} \
DTS_VERSION=${DTS_VERSION} \
CMAKE_VERSION=${CMAKE_VERSION} \
LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib64:/opt/rh/httpd24/root/usr/lib64:/opt/rh/devtoolset-${DTS_VERSION}/root/usr/lib64:/opt/rh/devtoolset-${DTS_VERSION}/root/usr/lib:${LD_LIBRARY_PATH} \
PATH=/opt/rh/rh-git218/root/usr/bin:/usr/local/bin:/opt/rh/devtoolset-${DTS_VERSION}/root/usr/bin:/opt/app-root/src/bin:/opt/rh/devtoolset-${DTS_VERSION}/root/usr/bin/:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin
@@ -69,3 +68,4 @@ RUN export DOWNLOADS_DIR=/tmp/downloads && \
/tmp/install_cmake.sh && \
# /tmp/patchup.sh && \
rm -rf /tmp/downloads
# TODO: Remove scripts from /tmp ?