Skip to content

Commit bfe51c2

Browse files
committed
2024.2 images
- 2024.2 images - update latest / preview / draft tags for Docker images - update Python dependencies (resolve dependabot PRs) - update pylint and fix pylint / pytest warnings - Fix SonarCloud scanning - Conan 1.65 (was 1.64) - Expat 2.6.3 (was 2.5.0) to address CVEs CVE-2024-45492 CVE-2024-45491 CVE-2024-45490 - fixes #196 : ci-openrv build container. OpenRV doesn't build yet, waiting for Qt6 support. For now openrv builds in non-default review group. - fixes #150 : rename master branch to main - fixes #218 : only attempt to use larger runners when running in context of ASWF GitHub org. - fixes #221 : ci-usd now includes Python dependencies - fixes #148 : Vulkan SDK and runtime now included in all images, initially required for ci-openrv, but useful in general. Also Qt now built with Vulkan support - CUDA 12.6.1 (was 12.3.0) - Java 17 (was 11) for ci-opencue image - Imath 3.1.12 (was 3.1.11) - MaterialX 1.39.1 (was 1.38.10) - OpenImageIO 2.15.16.0 (was 2.15.15.0) - OpenShadingLanguage 1.13.11.0 (was 1.13.10.0) - Python 3.11.10 (was 3.11.9) - USD 24.08 (was 24.05) with PR #3159 for MateriaX 1.39.1 Signed-off-by: Jean-Francois Panisset <[email protected]>
1 parent baf199e commit bfe51c2

File tree

30 files changed

+375
-136
lines changed

30 files changed

+375
-136
lines changed

CHANGELOG.md

+34-3
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,47 @@
22

33
All notable changes to this project will be documented in this file.
44

5-
# 2024-09-19
5+
# 2024-10-05
66

7+
- 2024.2 images
78
- update latest / preview / draft tags for Docker images
89
- update Python dependencies (resolve dependabot PRs)
910
- update pylint and fix pylint / pytest warnings
1011
- Fix SonarCloud scanning
1112
- Conan 1.65 (was 1.64)
1213
- Expat 2.6.3 (was 2.5.0) to address CVEs CVE-2024-45492 CVE-2024-45491 CVE-2024-45490
13-
- ci-openrv build container
14-
- rename master branch to main
14+
- fixes #196 : ci-openrv build container. OpenRV doesn't build yet, waiting for Qt6 support.
15+
For now openrv builds in non-default review group.
16+
- fixes #150 : rename master branch to main
17+
- fixes #218 : only attempt to use larger runners when running in context of ASWF GitHub org.
18+
- fixes #221 : ci-usd now includes Python dependencies
19+
- fixes #148 : Vulkan SDK and runtime now included in all images, initially required
20+
for ci-openrv, but useful in general. Also Qt now built with Vulkan support
21+
- CUDA 12.6.1 (was 12.3.0)
22+
- Java 17 (was 11) for ci-opencue image
23+
- Imath 3.1.12 (was 3.1.11)
24+
- MaterialX 1.39.1 (was 1.38.10)
25+
- OpenImageIO 2.15.16.0 (was 2.15.15.0)
26+
- OpenShadingLanguage 1.13.11.0 (was 1.13.10.0)
27+
- Python 3.11.10 (was 3.11.9)
28+
- USD 24.08 (was 24.05)
29+
30+
### New CI Images
31+
32+
* `aswf/ci-common:4-clang16.2`, `aswf/ci-common:4-clang17.2` : A base Rocky 8.10 image with GCC 11.2.1 (DTS 11), Clang 16.0/17.0 and CUDA 12.3.
33+
* `aswf/ci-base:2024.2`
34+
* `aswf/ci-baseqt:2024.2`
35+
* `aswf/ci-opencue:2024.2`
36+
* `aswf/ci-openexr:2024.2`
37+
* `aswf/ci-ocio:2024.2`
38+
* `aswf/ci-oiio:2024.2`
39+
* `aswf/ci-otio:2024.2`
40+
* `aswf/ci-materialx:2024.2`
41+
* `aswf/ci-usd:2024.2`
42+
* `aswf/ci-openrv:2024.2`
43+
* `aswf/ci-osl:2024-clang16.2`,`aswf/ci-osl:2024-clang17.2`
44+
* `aswf/ci-openvdb:2024-clang16.2`, `aswf/ci-openvdb:2024-clang17.2`
45+
* `aswf/ci-vfxall:2024-clang16.1`, `aswf/ci-vfxall:2024-clang17.1`
1546

1647
## 2024-09-02
1748

README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Each image (apart from `ci-common`) is available for multiple VFX Platform Years
2020
| [aswf/ci-common:1](https://hub.docker.com/r/aswf/ci-common/tags?name=1) ![Image Version](https://img.shields.io/docker/v/aswf/ci-common/latest) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-common/latest) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-common) | A base CentOS-7 image with devtoolset-6 (GCC-6.3.1), clang-6-10 and cuda-10.2. |
2121
| [aswf/ci-common:2](https://hub.docker.com/r/aswf/ci-common/tags?name=2) ![Image Version](https://img.shields.io/docker/v/aswf/ci-common/preview) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-common/preview) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-common) | A base CentOS-7 image with devtoolset-9.1 (GCC-9.3.1), clang-10-14 and cuda-11.4. |
2222
| [aswf/ci-common:3](https://hub.docker.com/r/aswf/ci-common/tags?name=3) ![Image Version](https://img.shields.io/docker/v/aswf/ci-common/preview) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-common/preview) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-common) | A base RockyLinux-8 image with gcc-toolset-11 (GCC-11.2.x), clang-14-15 and cuda-11.8. |
23-
| [aswf/ci-common:4](https://hub.docker.com/r/aswf/ci-common/tags?name=4) ![Image Version](https://img.shields.io/docker/v/aswf/ci-common/preview) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-common/preview) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-common) | A base RockyLinux-8 image with gcc-toolset-11 (GCC-11.2.x), clang-16-17 and cuda-12.3. |
23+
| [aswf/ci-common:4](https://hub.docker.com/r/aswf/ci-common/tags?name=4) ![Image Version](https://img.shields.io/docker/v/aswf/ci-common/preview) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-common/preview) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-common) | A base RockyLinux-8 image with gcc-toolset-11 (GCC-11.2.x), clang-16-17 and cuda-12.6.1. |
2424
| [aswf/ci-base:2018](https://hub.docker.com/r/aswf/ci-base/tags?name=2018) ![Image Version](https://img.shields.io/docker/v/aswf/ci-base/2018) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-base/2018) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-base) | Based on `aswf/ci-common:1` with most VFX Platform requirements pre-installed. |
2525
| [aswf/ci-base:2021](https://hub.docker.com/r/aswf/ci-base/tags?name=2021) ![Image Version](https://img.shields.io/docker/v/aswf/ci-base/2021) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-base/2021) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-base) | Based on `aswf/ci-common:2` with most VFX Platform requirements pre-installed. |
2626
| [aswf/ci-base:2022](https://hub.docker.com/r/aswf/ci-base/tags?name=2022) ![Image Version](https://img.shields.io/docker/v/aswf/ci-base/2022) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-base/2022) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-base) | Based on `aswf/ci-common:2` with most VFX Platform requirements pre-installed. |
@@ -67,6 +67,7 @@ Each image (apart from `ci-common`) is available for multiple VFX Platform Years
6767
| [aswf/ci-osl:2022](https://hub.docker.com/r/aswf/ci-osl/tags?name=2022) ![Image Version](https://img.shields.io/docker/v/aswf/ci-osl/2022) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-osl/2022) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-osl) | Based on `aswf/ci-common:2`, comes with all OpenShadingLanguage upstream dependencies pre-installed. |
6868
| [aswf/ci-osl:2023](https://hub.docker.com/r/aswf/ci-osl/tags?name=2023) ![Image Version](https://img.shields.io/docker/v/aswf/ci-osl/2023) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-osl/2023) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-osl) | Based on `aswf/ci-common:3`, comes with all OpenShadingLanguage upstream dependencies pre-installed. |
6969
| [aswf/ci-osl:2024](https://hub.docker.com/r/aswf/ci-osl/tags?name=2024) ![Image Version](https://img.shields.io/docker/v/aswf/ci-osl/2024) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-osl/2024) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-osl) | Based on `aswf/ci-common:4`, comes with all OpenShadingLanguage upstream dependencies pre-installed. |
70+
| [aswf/ci-openrv:2024](https://hub.docker.com/r/aswf/ci-openrv/tags?name=2024) ![Image Version](https://img.shields.io/docker/v/aswf/ci-openrv/2024) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-openrv/2024) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-openrv) | Based on `aswf/ci-common:4`, comes with all OpenRV upstream dependencies pre-installed. |
7071
| [aswf/ci-vfxall:2019](https://hub.docker.com/r/aswf/ci-vfxall/tags?name=2019) ![Image Version](https://img.shields.io/docker/v/aswf/ci-vfxall/2019) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-vfxall/2019) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-vfxall) | Based on `aswf/ci-common:1`, comes with most VFX packages pre-installed. |
7172
| [aswf/ci-vfxall:2020](https://hub.docker.com/r/aswf/ci-vfxall/tags?name=2020) ![Image Version](https://img.shields.io/docker/v/aswf/ci-vfxall/2020) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-vfxall/2020) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-vfxall) | Based on `aswf/ci-common:1`, comes with most VFX packages pre-installed. |
7273
| [aswf/ci-vfxall:2021](https://hub.docker.com/r/aswf/ci-vfxall/tags?name=2021) ![Image Version](https://img.shields.io/docker/v/aswf/ci-vfxall/2021) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-vfxall/2021) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-vfxall) | Based on `aswf/ci-common:2`, comes with most VFX packages pre-installed. |

ci-base/README.md

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci-baseqt/README.md

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci-common/README.md

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci-materialx/README.md

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci-ocio/README.md

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci-oiio/README.md

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci-opencue/README.md

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci-openexr/README.md

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci-openrv/Dockerfile

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci-openrv/README.md

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci-openrv/image.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ implicit_packages:
1313
- vfxplatform
1414
docker_from: ${ASWF_ORG}/ci-common:${CI_COMMON_VERSION}-clang${ASWF_CLANG_MAJOR_VERSION}
1515
docker_package_version: $ASWF_VFXPLATFORM_VERSION
16-
docker_commands: |
17-
# Dependencies missing for OpenRV
18-
RUN sudo dnf install -y meson nasm libaio-devel mesa-vulkan-devel mesa-libOSMesa mesa-libOSMesa-devel
1916
docker_post_commands: |
2017
# Workaround: Reinstall Qt to a temporary location to prevent conflicts with PySide during OpenRV builds.
2118
# This is effectively a copy since Qt is already in the cache from previous steps.

ci-openvdb/README.md

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci-osl/README.md

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci-otio/README.md

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci-usd/Dockerfile

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci-usd/README.md

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci-usd/image.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,5 @@ implicit_packages:
3131
- vfxplatform
3232
docker_from: ${ASWF_ORG}/ci-common:${CI_COMMON_VERSION}-clang${ASWF_CLANG_MAJOR_VERSION}
3333
docker_package_version: $ASWF_VFXPLATFORM_VERSION
34+
docker_post_commands: |
35+
RUN sudo pip3 install jinja2 PyOpenGL

0 commit comments

Comments
 (0)