Skip to content

Commit

Permalink
2024.2 images
Browse files Browse the repository at this point in the history
- 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 <panisset@gmail.com>
  • Loading branch information
jfpanisset committed Oct 6, 2024
1 parent baf199e commit bfe51c2
Show file tree
Hide file tree
Showing 30 changed files with 375 additions and 136 deletions.
37 changes: 34 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,47 @@

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

# 2024-09-19
# 2024-10-05

- 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
- ci-openrv build container
- rename master branch to main
- 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)

### New CI Images

* `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.
* `aswf/ci-base:2024.2`
* `aswf/ci-baseqt:2024.2`
* `aswf/ci-opencue:2024.2`
* `aswf/ci-openexr:2024.2`
* `aswf/ci-ocio:2024.2`
* `aswf/ci-oiio:2024.2`
* `aswf/ci-otio:2024.2`
* `aswf/ci-materialx:2024.2`
* `aswf/ci-usd:2024.2`
* `aswf/ci-openrv:2024.2`
* `aswf/ci-osl:2024-clang16.2`,`aswf/ci-osl:2024-clang17.2`
* `aswf/ci-openvdb:2024-clang16.2`, `aswf/ci-openvdb:2024-clang17.2`
* `aswf/ci-vfxall:2024-clang16.1`, `aswf/ci-vfxall:2024-clang17.1`

## 2024-09-02

Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Each image (apart from `ci-common`) is available for multiple VFX Platform Years
| [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. |
| [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. |
| [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. |
| [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. |
| [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. |
| [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. |
| [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. |
| [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. |
Expand Down Expand Up @@ -67,6 +67,7 @@ Each image (apart from `ci-common`) is available for multiple VFX Platform Years
| [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. |
| [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. |
| [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. |
| [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. |
| [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. |
| [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. |
| [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. |
Expand Down
4 changes: 2 additions & 2 deletions ci-base/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ci-baseqt/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions ci-common/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ci-materialx/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions ci-ocio/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions ci-oiio/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ci-opencue/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ci-openexr/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions ci-openrv/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ci-openrv/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions ci-openrv/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ implicit_packages:
- vfxplatform
docker_from: ${ASWF_ORG}/ci-common:${CI_COMMON_VERSION}-clang${ASWF_CLANG_MAJOR_VERSION}
docker_package_version: $ASWF_VFXPLATFORM_VERSION
docker_commands: |
# Dependencies missing for OpenRV
RUN sudo dnf install -y meson nasm libaio-devel mesa-vulkan-devel mesa-libOSMesa mesa-libOSMesa-devel
docker_post_commands: |
# Workaround: Reinstall Qt to a temporary location to prevent conflicts with PySide during OpenRV builds.
# This is effectively a copy since Qt is already in the cache from previous steps.
Expand Down
12 changes: 6 additions & 6 deletions ci-openvdb/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions ci-osl/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ci-otio/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions ci-usd/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions ci-usd/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions ci-usd/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,5 @@ implicit_packages:
- vfxplatform
docker_from: ${ASWF_ORG}/ci-common:${CI_COMMON_VERSION}-clang${ASWF_CLANG_MAJOR_VERSION}
docker_package_version: $ASWF_VFXPLATFORM_VERSION
docker_post_commands: |
RUN sudo pip3 install jinja2 PyOpenGL
Loading

0 comments on commit bfe51c2

Please sign in to comment.