diff --git a/ci-base/Dockerfile b/ci-base/Dockerfile index a48e1a4e..708be8e5 100644 --- a/ci-base/Dockerfile +++ b/ci-base/Dockerfile @@ -54,6 +54,7 @@ FROM ${ASWF_ORG}/ci-common:${CI_COMMON_VERSION}-clang${ASWF_CLANG_MAJOR_VERSION} ARG ASWF_ORG +ARG ASWF_CONAN_HOME ARG ASWF_PKG_ORG ARG ASWF_VERSION ARG CI_COMMON_VERSION diff --git a/ci-baseqt/Dockerfile b/ci-baseqt/Dockerfile index 45a67a31..5514c1a3 100644 --- a/ci-baseqt/Dockerfile +++ b/ci-baseqt/Dockerfile @@ -59,6 +59,7 @@ FROM ${ASWF_ORG}/ci-common:${CI_COMMON_VERSION}-clang${ASWF_CLANG_MAJOR_VERSION} ARG ASWF_ORG +ARG ASWF_CONAN_HOME ARG ASWF_PKG_ORG ARG ASWF_VERSION ARG CI_COMMON_VERSION diff --git a/ci-common/Dockerfile b/ci-common/Dockerfile index 1b2af40f..9c545fdb 100644 --- a/ci-common/Dockerfile +++ b/ci-common/Dockerfile @@ -34,6 +34,7 @@ FROM ${ASWF_BASEOS_IMAGE}:${ASWF_CUDA_VERSION}-devel-${ASWF_BASEOS_DISTRO} AS ci ARG ASWF_ORG +ARG ASWF_CONAN_HOME ARG ASWF_PKG_ORG ARG ASWF_VERSION ARG CI_COMMON_VERSION diff --git a/ci-materialx/Dockerfile b/ci-materialx/Dockerfile index 86702300..095d3d53 100644 --- a/ci-materialx/Dockerfile +++ b/ci-materialx/Dockerfile @@ -67,6 +67,7 @@ FROM ${ASWF_ORG}/ci-common:${CI_COMMON_VERSION}-clang${ASWF_CLANG_MAJOR_VERSION} ARG ASWF_ORG +ARG ASWF_CONAN_HOME ARG ASWF_PKG_ORG ARG ASWF_VERSION ARG CI_COMMON_VERSION diff --git a/ci-ocio/Dockerfile b/ci-ocio/Dockerfile index 727b8430..ba284643 100644 --- a/ci-ocio/Dockerfile +++ b/ci-ocio/Dockerfile @@ -57,6 +57,7 @@ FROM ${ASWF_ORG}/ci-common:${CI_COMMON_VERSION}-clang${ASWF_CLANG_MAJOR_VERSION} ARG ASWF_ORG +ARG ASWF_CONAN_HOME ARG ASWF_PKG_ORG ARG ASWF_VERSION ARG CI_COMMON_VERSION diff --git a/ci-oiio/Dockerfile b/ci-oiio/Dockerfile index 65dc20f0..add527ed 100644 --- a/ci-oiio/Dockerfile +++ b/ci-oiio/Dockerfile @@ -68,6 +68,7 @@ FROM ${ASWF_ORG}/ci-common:${CI_COMMON_VERSION}-clang${ASWF_CLANG_MAJOR_VERSION} ARG ASWF_ORG +ARG ASWF_CONAN_HOME ARG ASWF_PKG_ORG ARG ASWF_VERSION ARG CI_COMMON_VERSION diff --git a/ci-opencue/Dockerfile b/ci-opencue/Dockerfile index 1452270f..906f0b13 100644 --- a/ci-opencue/Dockerfile +++ b/ci-opencue/Dockerfile @@ -26,6 +26,7 @@ FROM ${ASWF_ORG}/ci-common:${CI_COMMON_VERSION}-clang${ASWF_CLANG_MAJOR_VERSION} ARG ASWF_ORG +ARG ASWF_CONAN_HOME ARG ASWF_PKG_ORG ARG ASWF_VERSION ARG CI_COMMON_VERSION diff --git a/ci-openexr/Dockerfile b/ci-openexr/Dockerfile index 23211ce9..aaf09ab2 100644 --- a/ci-openexr/Dockerfile +++ b/ci-openexr/Dockerfile @@ -31,6 +31,7 @@ FROM ${ASWF_ORG}/ci-common:${CI_COMMON_VERSION}-clang${ASWF_CLANG_MAJOR_VERSION} ARG ASWF_ORG +ARG ASWF_CONAN_HOME ARG ASWF_PKG_ORG ARG ASWF_VERSION ARG CI_COMMON_VERSION diff --git a/ci-openrv/Dockerfile b/ci-openrv/Dockerfile index 8c5d15b8..36097357 100644 --- a/ci-openrv/Dockerfile +++ b/ci-openrv/Dockerfile @@ -28,6 +28,7 @@ FROM ${ASWF_ORG}/ci-common:${CI_COMMON_VERSION}-clang${ASWF_CLANG_MAJOR_VERSION} ARG ASWF_ORG +ARG ASWF_CONAN_HOME ARG ASWF_PKG_ORG ARG ASWF_VERSION ARG CI_COMMON_VERSION diff --git a/ci-openvdb/Dockerfile b/ci-openvdb/Dockerfile index cfd98cfc..db3e3024 100644 --- a/ci-openvdb/Dockerfile +++ b/ci-openvdb/Dockerfile @@ -69,6 +69,7 @@ FROM ${ASWF_ORG}/ci-common:${CI_COMMON_VERSION}-clang${ASWF_CLANG_MAJOR_VERSION} ARG ASWF_ORG +ARG ASWF_CONAN_HOME ARG ASWF_PKG_ORG ARG ASWF_VERSION ARG CI_COMMON_VERSION diff --git a/ci-osl/Dockerfile b/ci-osl/Dockerfile index 7d651611..228ea1ed 100644 --- a/ci-osl/Dockerfile +++ b/ci-osl/Dockerfile @@ -71,6 +71,7 @@ FROM ${ASWF_ORG}/ci-common:${CI_COMMON_VERSION}-clang${ASWF_CLANG_MAJOR_VERSION} ARG ASWF_ORG +ARG ASWF_CONAN_HOME ARG ASWF_PKG_ORG ARG ASWF_VERSION ARG CI_COMMON_VERSION diff --git a/ci-otio/Dockerfile b/ci-otio/Dockerfile index cba2c1c0..f07e6060 100644 --- a/ci-otio/Dockerfile +++ b/ci-otio/Dockerfile @@ -59,6 +59,7 @@ FROM ${ASWF_ORG}/ci-common:${CI_COMMON_VERSION}-clang${ASWF_CLANG_MAJOR_VERSION} ARG ASWF_ORG +ARG ASWF_CONAN_HOME ARG ASWF_PKG_ORG ARG ASWF_VERSION ARG CI_COMMON_VERSION diff --git a/ci-usd/Dockerfile b/ci-usd/Dockerfile index 667c3932..681e15d2 100644 --- a/ci-usd/Dockerfile +++ b/ci-usd/Dockerfile @@ -47,8 +47,16 @@ ARG ASWF_LIBWEBP_VERSION ARG ASWF_MD4C_VERSION ARG ASWF_QT_VERSION ARG ASWF_PYSIDE_VERSION +ARG ASWF_HIGHWAY_VERSION ARG ASWF_IMATH_VERSION +ARG ASWF_LCMS_VERSION +ARG ASWF_LIBUHDR_VERSION +ARG ASWF_PTEX_VERSION +ARG ASWF_LIBJXL_VERSION +ARG ASWF_OPENEXR_VERSION ARG ASWF_ALEMBIC_VERSION +ARG ASWF_OCIO_VERSION +ARG ASWF_OIIO_VERSION ARG ASWF_OPENSUBDIV_VERSION ARG ASWF_PARTIO_VERSION ARG ASWF_MATERIALX_VERSION @@ -64,6 +72,7 @@ FROM ${ASWF_ORG}/ci-common:${CI_COMMON_VERSION}-clang${ASWF_CLANG_MAJOR_VERSION} ARG ASWF_ORG +ARG ASWF_CONAN_HOME ARG ASWF_PKG_ORG ARG ASWF_VERSION ARG CI_COMMON_VERSION @@ -105,8 +114,16 @@ ARG ASWF_LIBWEBP_VERSION ARG ASWF_MD4C_VERSION ARG ASWF_QT_VERSION ARG ASWF_PYSIDE_VERSION +ARG ASWF_HIGHWAY_VERSION ARG ASWF_IMATH_VERSION +ARG ASWF_LCMS_VERSION +ARG ASWF_LIBUHDR_VERSION +ARG ASWF_PTEX_VERSION +ARG ASWF_LIBJXL_VERSION +ARG ASWF_OPENEXR_VERSION ARG ASWF_ALEMBIC_VERSION +ARG ASWF_OCIO_VERSION +ARG ASWF_OIIO_VERSION ARG ASWF_OPENSUBDIV_VERSION ARG ASWF_PARTIO_VERSION ARG ASWF_MATERIALX_VERSION @@ -162,8 +179,16 @@ LABEL io.aswf.docker.versions.libwebp="$ASWF_LIBWEBP_VERSION" LABEL io.aswf.docker.versions.md4c="$ASWF_MD4C_VERSION" LABEL io.aswf.docker.versions.qt="$ASWF_QT_VERSION" LABEL io.aswf.docker.versions.pyside="$ASWF_PYSIDE_VERSION" +LABEL io.aswf.docker.versions.highway="$ASWF_HIGHWAY_VERSION" LABEL io.aswf.docker.versions.imath="$ASWF_IMATH_VERSION" +LABEL io.aswf.docker.versions.lcms="$ASWF_LCMS_VERSION" +LABEL io.aswf.docker.versions.libuhdr="$ASWF_LIBUHDR_VERSION" +LABEL io.aswf.docker.versions.ptex="$ASWF_PTEX_VERSION" +LABEL io.aswf.docker.versions.libjxl="$ASWF_LIBJXL_VERSION" +LABEL io.aswf.docker.versions.openexr="$ASWF_OPENEXR_VERSION" LABEL io.aswf.docker.versions.alembic="$ASWF_ALEMBIC_VERSION" +LABEL io.aswf.docker.versions.ocio="$ASWF_OCIO_VERSION" +LABEL io.aswf.docker.versions.oiio="$ASWF_OIIO_VERSION" LABEL io.aswf.docker.versions.opensubdiv="$ASWF_OPENSUBDIV_VERSION" LABEL io.aswf.docker.versions.partio="$ASWF_PARTIO_VERSION" LABEL io.aswf.docker.versions.materialx="$ASWF_MATERIALX_VERSION" @@ -215,8 +240,16 @@ ENV ASWF_LIBWEBP_VERSION=$ASWF_LIBWEBP_VERSION ENV ASWF_MD4C_VERSION=$ASWF_MD4C_VERSION ENV ASWF_QT_VERSION=$ASWF_QT_VERSION ENV ASWF_PYSIDE_VERSION=$ASWF_PYSIDE_VERSION +ENV ASWF_HIGHWAY_VERSION=$ASWF_HIGHWAY_VERSION ENV ASWF_IMATH_VERSION=$ASWF_IMATH_VERSION +ENV ASWF_LCMS_VERSION=$ASWF_LCMS_VERSION +ENV ASWF_LIBUHDR_VERSION=$ASWF_LIBUHDR_VERSION +ENV ASWF_PTEX_VERSION=$ASWF_PTEX_VERSION +ENV ASWF_LIBJXL_VERSION=$ASWF_LIBJXL_VERSION +ENV ASWF_OPENEXR_VERSION=$ASWF_OPENEXR_VERSION ENV ASWF_ALEMBIC_VERSION=$ASWF_ALEMBIC_VERSION +ENV ASWF_OCIO_VERSION=$ASWF_OCIO_VERSION +ENV ASWF_OIIO_VERSION=$ASWF_OIIO_VERSION ENV ASWF_OPENSUBDIV_VERSION=$ASWF_OPENSUBDIV_VERSION ENV ASWF_PARTIO_VERSION=$ASWF_PARTIO_VERSION ENV ASWF_MATERIALX_VERSION=$ASWF_MATERIALX_VERSION @@ -273,8 +306,16 @@ libwebp/${ASWF_LIBWEBP_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} md4c/${ASWF_MD4C_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} qt/${ASWF_QT_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} pyside/${ASWF_PYSIDE_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} +highway/${ASWF_HIGHWAY_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} imath/${ASWF_IMATH_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} +lcms/${ASWF_LCMS_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} +libuhdr/${ASWF_LIBUHDR_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} +ptex/${ASWF_PTEX_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} +libjxl/${ASWF_LIBJXL_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} +openexr/${ASWF_OPENEXR_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} alembic/${ASWF_ALEMBIC_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} +ocio/${ASWF_OCIO_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} +oiio/${ASWF_OIIO_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} opensubdiv/${ASWF_OPENSUBDIV_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} partio/${ASWF_PARTIO_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} materialx/${ASWF_MATERIALX_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} diff --git a/ci-usd/README.md b/ci-usd/README.md index 1f161bdd..71e6047b 100644 --- a/ci-usd/README.md +++ b/ci-usd/README.md @@ -34,7 +34,11 @@ Contains: * qt-5.12.6 * pyside-5.12.6 * imath-2.3.0 +* ptex-2.1.33 +* openexr-2.3.0 * alembic-1.7.11 +* ocio-1.1.0 +* oiio-2.0.8 * opensubdiv-3_3_3 * partio-1.10.1 * numpy-1.14 @@ -57,7 +61,11 @@ Contains: * qt-5.12.6 * pyside-5.12.6 * imath-2.4.0 +* ptex-2.3.2 +* openexr-2.4.0 * alembic-1.7.12 +* ocio-1.1.1 +* oiio-2.1.13.0 * opensubdiv-3_4_3 * partio-1.10.1 * numpy-1.16 @@ -80,7 +88,11 @@ Contains: * qt-5.15.2 * pyside-5.15.2 * imath-2.5.5 +* ptex-2.3.2 +* openexr-2.5.5 * alembic-1.7.16 +* ocio-2.0.1 +* oiio-2.2.14.0 * opensubdiv-3_4_3 * partio-1.14.0 * numpy-1.19 @@ -103,7 +115,11 @@ Contains: * qt-5.15.2 * pyside-5.15.2 * imath-3.1.5 +* ptex-2.4.0 +* openexr-3.1.5 * alembic-1.8.2 +* ocio-2.1.1 +* oiio-2.4.5.0 * opensubdiv-3_4_4 * partio-1.14.0 * materialx-1.38.5 @@ -127,7 +143,11 @@ Contains: * qt-5.15.9 * pyside-5.15.9 * imath-3.1.9 +* ptex-2.4.2 +* openexr-3.1.11 * alembic-1.8.5 +* ocio-2.2.1 +* oiio-2.4.13.0 * opensubdiv-3_5_0 * partio-1.17.1 * materialx-1.38.7 @@ -167,8 +187,16 @@ Contains: * md4c-0.4.8 * qt-6.5.4 * pyside-6.5.4 +* highway-1.2.0 * imath-3.1.12 +* lcms-2.16 +* libuhdr-1.4.0 +* ptex-2.4.2 +* libjxl-0.11.1 +* openexr-3.2.4 * alembic-1.8.6 +* ocio-2.3.2 +* oiio-2.5.18.0 * opensubdiv-3.6.0 * partio-1.17.1 * materialx-1.39.2 @@ -208,8 +236,16 @@ Contains: * md4c-0.4.8 * qt-6.5.4 * pyside-6.5.4 +* highway-1.2.0 * imath-3.1.12 +* lcms-2.16 +* libuhdr-1.4.0 +* ptex-2.4.3 +* libjxl-0.11.1 +* openexr-3.3.3 * alembic-1.8.8 +* ocio-2.4.2 +* oiio-3.0.5.0 * opensubdiv-3.6.0 * partio-1.17.3 * materialx-1.39.3 diff --git a/ci-usd/image.yaml b/ci-usd/image.yaml index 2bee1daa..eb6fcd8e 100644 --- a/ci-usd/image.yaml +++ b/ci-usd/image.yaml @@ -37,8 +37,16 @@ packages: - md4c - qt # base2-2 packages - pyside # base2-3 packages - - imath # vfx1-1 packages + - highway # vfx1-1 packages + - imath + - lcms + - libuhdr + - ptex + - libjxl # vfx1-2 packages + - openexr - alembic # vfx1-3 packages + - ocio + - oiio # vfx1-4 packages - opensubdiv # vfx2-1 packages - partio - materialx diff --git a/ci-vfxall/Dockerfile b/ci-vfxall/Dockerfile index 46a86141..72108a06 100644 --- a/ci-vfxall/Dockerfile +++ b/ci-vfxall/Dockerfile @@ -80,6 +80,7 @@ FROM ${ASWF_ORG}/ci-common:${CI_COMMON_VERSION}-clang${ASWF_CLANG_MAJOR_VERSION} ARG ASWF_ORG +ARG ASWF_CONAN_HOME ARG ASWF_PKG_ORG ARG ASWF_VERSION ARG CI_COMMON_VERSION diff --git a/python/aswfdocker/data/ci-image-dockerfile.jinja2 b/python/aswfdocker/data/ci-image-dockerfile.jinja2 index fe4b3a06..555bc11f 100644 --- a/python/aswfdocker/data/ci-image-dockerfile.jinja2 +++ b/python/aswfdocker/data/ci-image-dockerfile.jinja2 @@ -45,6 +45,7 @@ FROM {{ docker_from }} AS ci-{{ name }} ARG ASWF_ORG +ARG ASWF_CONAN_HOME ARG ASWF_PKG_ORG ARG ASWF_VERSION ARG CI_COMMON_VERSION