Repository: AcademySoftwareFoundation/aswf-docker (language: python)

Issue:
Sonar scans require newer version of builder wrapper
Sonar scans are expecting a newer version of the build wrapper. Here is warning output from the most recent Sonar scan of the Imath repository:

" File  /__w/Imath/Imath/_build/bw_output/build-wrapper-dump.json
was generated using 6.16 build-wrapper version,
which does not match analyzer 6.21.0.32709 version.

Please download matching version from the server
https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip "




Discussion / hints:
Thanks for the report @xlietz ! I'll upgrade to the sonar scanner v4.6.2.2472 and the latest build wrapper and re-release new CI images.

Fix patch:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35138cfd..bcf71bc3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,81 @@
 
 All notable changes to this project will be documented in this file.
 
+## 2021-06-19
+
+### Changed
+* Updated to sonar scanner cli v4.6.2.2472 and latest build wrapper
+
+### New CI Images
+
+- `ci-common`:
+    - "1-clang6.8"
+    - "1-clang7.8"
+    - "1-clang8.8"
+    - "1-clang9.8"
+    - "1-clang10.8"
+    - "2-clang10.4"
+    - "2-clang11.4"
+- `ci-base`:
+    - "2018.8"
+    - "2019.8"
+    - "2020.8"
+    - "2021.5"
+- `ci-baseqt`:
+    - "2018.1"
+    - "2019.1"
+    - "2020.1"
+    - "2021.2"
+- `ci-openexr`:
+    - "2018.8"
+    - "2019.8"
+    - "2020.8"
+    - "2021.5"
+- `ci-ocio`:
+    - "2018.9"
+    - "2019.9"
+    - "2020.8"
+    - "2021.6"
+- `ci-opencue`:
+    - "2019"
+    - "2020"
+    - "2021"
+    - "2021.7"
+- `ci-usd`:
+    - "2019.9"
+    - "2020.8"
+    - "2021.6"
+- `ci-otio`:
+    - "2019.3"
+    - "2020.3"
+    - "2021.5"
+- `ci-osl`:
+    - "2018-clang7.5"
+    - "2019-clang6.5"
+    - "2019-clang7.5"
+    - "2019-clang8.5"
+    - "2019-clang9.5"
+    - "2019-clang10.5"
+    - "2020-clang7.5"
+    - "2021-clang10.7"
+    - "2021-clang11.7"
+- `ci-openvdb`:
+    - "2018-clang7.8"
+    - "2019-clang6.8"
+    - "2019-clang7.8"
+    - "2019-clang8.8"
+    - "2019-clang9.8"
+    - "2020-clang7.8"
+    - "2021-clang10.6"
+- `ci-vfxall`:
+    - "2019-clang6.12"
+    - "2019-clang7.12"
+    - "2019-clang8.12"
+    - "2019-clang9.12"
+    - "2020-clang7.10"
+    - "2021-clang10.7"
+
+
 ## 2021-05-12
 
 ### Changed
diff --git a/ci-base/README.md b/ci-base/README.md
index 39b8cbeb..38f7f65e 100644
--- a/ci-base/README.md
+++ b/ci-base/README.md
@@ -17,7 +17,7 @@ Contains: Python, TBB, Boost and other base libraries
 
 [Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-base/Dockerfile)
 
-## [aswf/ci-base:2018.7](https://hub.docker.com/r/aswf/ci-base/tags?page=1&name=2018.7)
+## [aswf/ci-base:2018.8](https://hub.docker.com/r/aswf/ci-base/tags?page=1&name=2018.8)
 
 Contains:
 * boost-1.61.0
@@ -31,7 +31,7 @@ Contains:
 * numpy-1.14
 * vfxplatform-2018
 
-## [aswf/ci-base:2019.7](https://hub.docker.com/r/aswf/ci-base/tags?page=1&name=2019.7)
+## [aswf/ci-base:2019.8](https://hub.docker.com/r/aswf/ci-base/tags?page=1&name=2019.8)
 
 Contains:
 * boost-1.66.0
@@ -45,7 +45,7 @@ Contains:
 * numpy-1.14
 * vfxplatform-2019
 
-## [aswf/ci-base:2020.7](https://hub.docker.com/r/aswf/ci-base/tags?page=1&name=2020.7)
+## [aswf/ci-base:2020.8](https://hub.docker.com/r/aswf/ci-base/tags?page=1&name=2020.8)
 
 Contains:
 * boost-1.70.0
@@ -59,7 +59,7 @@ Contains:
 * numpy-1.16
 * vfxplatform-2020
 
-## [aswf/ci-base:2021.4](https://hub.docker.com/r/aswf/ci-base/tags?page=1&name=2021.4)
+## [aswf/ci-base:2021.5](https://hub.docker.com/r/aswf/ci-base/tags?page=1&name=2021.5)
 
 Contains:
 * boost-1.73.0
diff --git a/ci-baseqt/README.md b/ci-baseqt/README.md
index af33a97f..178a8ea9 100644
--- a/ci-baseqt/README.md
+++ b/ci-baseqt/README.md
@@ -17,7 +17,7 @@ Contains: Python, TBB, Boost, Qt, PySide and other base libraries
 
 [Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-baseqt/Dockerfile)
 
-## [aswf/ci-baseqt:2018.0](https://hub.docker.com/r/aswf/ci-baseqt/tags?page=1&name=2018.0)
+## [aswf/ci-baseqt:2018.1](https://hub.docker.com/r/aswf/ci-baseqt/tags?page=1&name=2018.1)
 
 Contains:
 * boost-1.61.0
@@ -33,7 +33,7 @@ Contains:
 * numpy-1.14
 * vfxplatform-2018
 
-## [aswf/ci-baseqt:2019.0](https://hub.docker.com/r/aswf/ci-baseqt/tags?page=1&name=2019.0)
+## [aswf/ci-baseqt:2019.1](https://hub.docker.com/r/aswf/ci-baseqt/tags?page=1&name=2019.1)
 
 Contains:
 * boost-1.66.0
@@ -49,7 +49,7 @@ Contains:
 * numpy-1.14
 * vfxplatform-2019
 
-## [aswf/ci-baseqt:2020.0](https://hub.docker.com/r/aswf/ci-baseqt/tags?page=1&name=2020.0)
+## [aswf/ci-baseqt:2020.1](https://hub.docker.com/r/aswf/ci-baseqt/tags?page=1&name=2020.1)
 
 Contains:
 * boost-1.70.0
@@ -65,7 +65,7 @@ Contains:
 * numpy-1.16
 * vfxplatform-2020
 
-## [aswf/ci-baseqt:2021.1](https://hub.docker.com/r/aswf/ci-baseqt/tags?page=1&name=2021.1)
+## [aswf/ci-baseqt:2021.2](https://hub.docker.com/r/aswf/ci-baseqt/tags?page=1&name=2021.2)
 
 Contains:
 * boost-1.73.0
diff --git a/ci-common/README.md b/ci-common/README.md
index e828747f..1ddbc487 100644
--- a/ci-common/README.md
+++ b/ci-common/README.md
@@ -17,7 +17,7 @@ Contains: GCC, Clang, Jinja, ccache and all base OS libraries
 
 [Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-common/Dockerfile)
 
-## [aswf/ci-common:1-clang6.7](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=1-clang6.7)
+## [aswf/ci-common:1-clang6.8](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=1-clang6.8)
 
 Contains:
 * clang-6.0.1
@@ -25,9 +25,9 @@ Contains:
 * cuda-10.2
 * ccache-4.0
 * dts-6
-* sonar-4.5.0.2216
+* sonar-4.6.2.2472
 
-## [aswf/ci-common:1-clang7.7](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=1-clang7.7)
+## [aswf/ci-common:1-clang7.8](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=1-clang7.8)
 
 Contains:
 * clang-7.1.0
@@ -35,9 +35,9 @@ Contains:
 * cuda-10.2
 * ccache-4.0
 * dts-6
-* sonar-4.5.0.2216
+* sonar-4.6.2.2472
 
-## [aswf/ci-common:1-clang8.7](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=1-clang8.7)
+## [aswf/ci-common:1-clang8.8](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=1-clang8.8)
 
 Contains:
 * clang-8.0.1
@@ -45,9 +45,9 @@ Contains:
 * cuda-10.2
 * ccache-4.0
 * dts-6
-* sonar-4.5.0.2216
+* sonar-4.6.2.2472
 
-## [aswf/ci-common:1-clang9.7](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=1-clang9.7)
+## [aswf/ci-common:1-clang9.8](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=1-clang9.8)
 
 Contains:
 * clang-9.0.1
@@ -55,9 +55,9 @@ Contains:
 * cuda-10.2
 * ccache-4.0
 * dts-6
-* sonar-4.5.0.2216
+* sonar-4.6.2.2472
 
-## [aswf/ci-common:1-clang10.7](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=1-clang10.7)
+## [aswf/ci-common:1-clang10.8](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=1-clang10.8)
 
 Contains:
 * clang-10.0.1
@@ -65,9 +65,9 @@ Contains:
 * cuda-10.2
 * ccache-4.0
 * dts-6
-* sonar-4.5.0.2216
+* sonar-4.6.2.2472
 
-## [aswf/ci-common:2-clang10.3](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=2-clang10.3)
+## [aswf/ci-common:2-clang10.4](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=2-clang10.4)
 
 Contains:
 * clang-10.0.1
@@ -75,9 +75,9 @@ Contains:
 * cuda-11.1
 * ccache-4.0
 * dts-9
-* sonar-4.5.0.2216
+* sonar-4.6.2.2472
 
-## [aswf/ci-common:2-clang11.3](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=2-clang11.3)
+## [aswf/ci-common:2-clang11.4](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=2-clang11.4)
 
 Contains:
 * clang-11.0.0
@@ -85,5 +85,5 @@ Contains:
 * cuda-11.1
 * ccache-4.0
 * dts-9
-* sonar-4.5.0.2216
+* sonar-4.6.2.2472
 
diff --git a/ci-ocio/README.md b/ci-ocio/README.md
index b498c5c1..f0e56c8f 100644
--- a/ci-ocio/README.md
+++ b/ci-ocio/README.md
@@ -18,7 +18,7 @@ Warning: this image does *not* contain OpenColorIO itself as it is used to *buil
 
 [Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-ocio/Dockerfile)
 
-## [aswf/ci-ocio:2018.8](https://hub.docker.com/r/aswf/ci-ocio/tags?page=1&name=2018.8)
+## [aswf/ci-ocio:2018.9](https://hub.docker.com/r/aswf/ci-ocio/tags?page=1&name=2018.9)
 
 Contains:
 * python-2.7.15
@@ -32,7 +32,7 @@ Contains:
 * numpy-1.14
 * vfxplatform-2018
 
-## [aswf/ci-ocio:2019.8](https://hub.docker.com/r/aswf/ci-ocio/tags?page=1&name=2019.8)
+## [aswf/ci-ocio:2019.9](https://hub.docker.com/r/aswf/ci-ocio/tags?page=1&name=2019.9)
 
 Contains:
 * python-2.7.15
@@ -46,7 +46,7 @@ Contains:
 * numpy-1.14
 * vfxplatform-2019
 
-## [aswf/ci-ocio:2020.7](https://hub.docker.com/r/aswf/ci-ocio/tags?page=1&name=2020.7)
+## [aswf/ci-ocio:2020.8](https://hub.docker.com/r/aswf/ci-ocio/tags?page=1&name=2020.8)
 
 Contains:
 * python-3.7.3
@@ -60,7 +60,7 @@ Contains:
 * numpy-1.16
 * vfxplatform-2020
 
-## [aswf/ci-ocio:2021.5](https://hub.docker.com/r/aswf/ci-ocio/tags?page=1&name=2021.5)
+## [aswf/ci-ocio:2021.6](https://hub.docker.com/r/aswf/ci-ocio/tags?page=1&name=2021.6)
 
 Contains:
 * python-3.7.9
diff --git a/ci-opencue/README.md b/ci-opencue/README.md
index 949bd0c5..9c8875ab 100644
--- a/ci-opencue/README.md
+++ b/ci-opencue/README.md
@@ -18,15 +18,7 @@ Warning: this image does *not* contain OpenCue itself as it is used to *build* O
 
 [Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-opencue/Dockerfile)
 
-## [aswf/ci-opencue:2018.9](https://hub.docker.com/r/aswf/ci-opencue/tags?page=1&name=2018.9)
-
-Contains:
-* python-2.7.15
-* cmake-3.9.4
-* numpy-1.14
-* vfxplatform-2018
-
-## [aswf/ci-opencue:2019.9](https://hub.docker.com/r/aswf/ci-opencue/tags?page=1&name=2019.9)
+## [aswf/ci-opencue:2019](https://hub.docker.com/r/aswf/ci-opencue/tags?page=1&name=2019)
 
 Contains:
 * python-2.7.15
@@ -34,7 +26,7 @@ Contains:
 * numpy-1.14
 * vfxplatform-2019
 
-## [aswf/ci-opencue:2020.9](https://hub.docker.com/r/aswf/ci-opencue/tags?page=1&name=2020.9)
+## [aswf/ci-opencue:2020](https://hub.docker.com/r/aswf/ci-opencue/tags?page=1&name=2020)
 
 Contains:
 * python-3.7.3
@@ -42,7 +34,15 @@ Contains:
 * numpy-1.16
 * vfxplatform-2020
 
-## [aswf/ci-opencue:2021.6](https://hub.docker.com/r/aswf/ci-opencue/tags?page=1&name=2021.6)
+## [aswf/ci-opencue:2021](https://hub.docker.com/r/aswf/ci-opencue/tags?page=1&name=2021)
+
+Contains:
+* python-3.7.9
+* cmake-3.19.3
+* numpy-1.19
+* vfxplatform-2021
+
+## [aswf/ci-opencue:2021.7](https://hub.docker.com/r/aswf/ci-opencue/tags?page=1&name=2021.7)
 
 Contains:
 * python-3.7.9
diff --git a/ci-openexr/README.md b/ci-openexr/README.md
index 7a47f213..d707ecb6 100644
--- a/ci-openexr/README.md
+++ b/ci-openexr/README.md
@@ -18,7 +18,7 @@ Warning: this image does *not* contain OpenEXR itself as it is used to *build* O
 
 [Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-openexr/Dockerfile)
 
-## [aswf/ci-openexr:2018.7](https://hub.docker.com/r/aswf/ci-openexr/tags?page=1&name=2018.7)
+## [aswf/ci-openexr:2018.8](https://hub.docker.com/r/aswf/ci-openexr/tags?page=1&name=2018.8)
 
 Contains:
 * python-2.7.15
@@ -27,7 +27,7 @@ Contains:
 * numpy-1.14
 * vfxplatform-2018
 
-## [aswf/ci-openexr:2019.7](https://hub.docker.com/r/aswf/ci-openexr/tags?page=1&name=2019.7)
+## [aswf/ci-openexr:2019.8](https://hub.docker.com/r/aswf/ci-openexr/tags?page=1&name=2019.8)
 
 Contains:
 * python-2.7.15
@@ -36,7 +36,7 @@ Contains:
 * numpy-1.14
 * vfxplatform-2019
 
-## [aswf/ci-openexr:2020.7](https://hub.docker.com/r/aswf/ci-openexr/tags?page=1&name=2020.7)
+## [aswf/ci-openexr:2020.8](https://hub.docker.com/r/aswf/ci-openexr/tags?page=1&name=2020.8)
 
 Contains:
 * python-3.7.3
@@ -45,7 +45,7 @@ Contains:
 * numpy-1.16
 * vfxplatform-2020
 
-## [aswf/ci-openexr:2021.4](https://hub.docker.com/r/aswf/ci-openexr/tags?page=1&name=2021.4)
+## [aswf/ci-openexr:2021.5](https://hub.docker.com/r/aswf/ci-openexr/tags?page=1&name=2021.5)
 
 Contains:
 * python-3.7.9
diff --git a/ci-openvdb/README.md b/ci-openvdb/README.md
index 1a2d0dd2..90dda62d 100644
--- a/ci-openvdb/README.md
+++ b/ci-openvdb/README.md
@@ -18,7 +18,7 @@ Warning: this image does *not* contain OpenVDB itself as it is used to *build* O
 
 [Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-openvdb/Dockerfile)
 
-## [aswf/ci-openvdb:2018-clang7.7](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2018-clang7.7)
+## [aswf/ci-openvdb:2018-clang7.8](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2018-clang7.8)
 
 Contains:
 * boost-1.61.0
@@ -32,7 +32,7 @@ Contains:
 * numpy-1.14
 * vfxplatform-2018
 
-## [aswf/ci-openvdb:2019-clang6.7](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2019-clang6.7)
+## [aswf/ci-openvdb:2019-clang6.8](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2019-clang6.8)
 
 Contains:
 * boost-1.66.0
@@ -46,7 +46,7 @@ Contains:
 * numpy-1.14
 * vfxplatform-2019
 
-## [aswf/ci-openvdb:2019-clang7.7](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2019-clang7.7)
+## [aswf/ci-openvdb:2019-clang7.8](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2019-clang7.8)
 
 Contains:
 * boost-1.66.0
@@ -60,7 +60,7 @@ Contains:
 * numpy-1.14
 * vfxplatform-2019
 
-## [aswf/ci-openvdb:2019-clang8.7](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2019-clang8.7)
+## [aswf/ci-openvdb:2019-clang8.8](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2019-clang8.8)
 
 Contains:
 * boost-1.66.0
@@ -74,7 +74,7 @@ Contains:
 * numpy-1.14
 * vfxplatform-2019
 
-## [aswf/ci-openvdb:2019-clang9.7](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2019-clang9.7)
+## [aswf/ci-openvdb:2019-clang9.8](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2019-clang9.8)
 
 Contains:
 * boost-1.66.0
@@ -88,7 +88,7 @@ Contains:
 * numpy-1.14
 * vfxplatform-2019
 
-## [aswf/ci-openvdb:2020-clang7.7](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2020-clang7.7)
+## [aswf/ci-openvdb:2020-clang7.8](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2020-clang7.8)
 
 Contains:
 * boost-1.70.0
@@ -102,7 +102,7 @@ Contains:
 * numpy-1.16
 * vfxplatform-2020
 
-## [aswf/ci-openvdb:2021-clang10.5](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2021-clang10.5)
+## [aswf/ci-openvdb:2021-clang10.6](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2021-clang10.6)
 
 Contains:
 * boost-1.73.0
diff --git a/ci-osl/README.md b/ci-osl/README.md
index 259d63fa..3f3f235d 100644
--- a/ci-osl/README.md
+++ b/ci-osl/README.md
@@ -18,7 +18,7 @@ Warning: this image does *not* contain OpenShadingLanguage itself as it is used
 
 [Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-osl/Dockerfile)
 
-## [aswf/ci-osl:2018-clang7.4](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2018-clang7.4)
+## [aswf/ci-osl:2018-clang7.5](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2018-clang7.5)
 
 Contains:
 * boost-1.61.0
@@ -32,7 +32,7 @@ Contains:
 * numpy-1.14
 * vfxplatform-2018
 
-## [aswf/ci-osl:2019-clang6.4](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2019-clang6.4)
+## [aswf/ci-osl:2019-clang6.5](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2019-clang6.5)
 
 Contains:
 * boost-1.66.0
@@ -46,7 +46,7 @@ Contains:
 * numpy-1.14
 * vfxplatform-2019
 
-## [aswf/ci-osl:2019-clang7.4](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2019-clang7.4)
+## [aswf/ci-osl:2019-clang7.5](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2019-clang7.5)
 
 Contains:
 * boost-1.66.0
@@ -60,7 +60,7 @@ Contains:
 * numpy-1.14
 * vfxplatform-2019
 
-## [aswf/ci-osl:2019-clang8.4](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2019-clang8.4)
+## [aswf/ci-osl:2019-clang8.5](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2019-clang8.5)
 
 Contains:
 * boost-1.66.0
@@ -74,7 +74,7 @@ Contains:
 * numpy-1.14
 * vfxplatform-2019
 
-## [aswf/ci-osl:2019-clang9.4](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2019-clang9.4)
+## [aswf/ci-osl:2019-clang9.5](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2019-clang9.5)
 
 Contains:
 * boost-1.66.0
@@ -88,7 +88,7 @@ Contains:
 * numpy-1.14
 * vfxplatform-2019
 
-## [aswf/ci-osl:2019-clang10.4](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2019-clang10.4)
+## [aswf/ci-osl:2019-clang10.5](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2019-clang10.5)
 
 Contains:
 * boost-1.66.0
@@ -102,7 +102,7 @@ Contains:
 * numpy-1.14
 * vfxplatform-2019
 
-## [aswf/ci-osl:2020-clang7.4](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2020-clang7.4)
+## [aswf/ci-osl:2020-clang7.5](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2020-clang7.5)
 
 Contains:
 * boost-1.70.0
@@ -116,7 +116,7 @@ Contains:
 * numpy-1.16
 * vfxplatform-2020
 
-## [aswf/ci-osl:2021-clang10.6](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2021-clang10.6)
+## [aswf/ci-osl:2021-clang10.7](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2021-clang10.7)
 
 Contains:
 * boost-1.73.0
@@ -130,7 +130,7 @@ Contains:
 * numpy-1.19
 * vfxplatform-2021
 
-## [aswf/ci-osl:2021-clang11.6](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2021-clang11.6)
+## [aswf/ci-osl:2021-clang11.7](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2021-clang11.7)
 
 Contains:
 * boost-1.73.0
diff --git a/ci-otio/README.md b/ci-otio/README.md
index d79a61b1..0dfa2936 100644
--- a/ci-otio/README.md
+++ b/ci-otio/README.md
@@ -18,7 +18,7 @@ Warning: this image does *not* contain OpenTimelineIO itself as it is used to *b
 
 [Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-otio/Dockerfile)
 
-## [aswf/ci-otio:2019.2](https://hub.docker.com/r/aswf/ci-otio/tags?page=1&name=2019.2)
+## [aswf/ci-otio:2019.3](https://hub.docker.com/r/aswf/ci-otio/tags?page=1&name=2019.3)
 
 Contains:
 * python-2.7.15
@@ -28,7 +28,7 @@ Contains:
 * numpy-1.14
 * vfxplatform-2019
 
-## [aswf/ci-otio:2020.2](https://hub.docker.com/r/aswf/ci-otio/tags?page=1&name=2020.2)
+## [aswf/ci-otio:2020.3](https://hub.docker.com/r/aswf/ci-otio/tags?page=1&name=2020.3)
 
 Contains:
 * python-3.7.3
@@ -38,7 +38,7 @@ Contains:
 * numpy-1.16
 * vfxplatform-2020
 
-## [aswf/ci-otio:2021.4](https://hub.docker.com/r/aswf/ci-otio/tags?page=1&name=2021.4)
+## [aswf/ci-otio:2021.5](https://hub.docker.com/r/aswf/ci-otio/tags?page=1&name=2021.5)
 
 Contains:
 * python-3.7.9
diff --git a/ci-usd/README.md b/ci-usd/README.md
index af7a79cd..d5a8044d 100644
--- a/ci-usd/README.md
+++ b/ci-usd/README.md
@@ -18,7 +18,7 @@ Warning: this image does *not* contain USD itself as it is used to *build* USD!
 
 [Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-usd/Dockerfile)
 
-## [aswf/ci-usd:2019.8](https://hub.docker.com/r/aswf/ci-usd/tags?page=1&name=2019.8)
+## [aswf/ci-usd:2019.9](https://hub.docker.com/r/aswf/ci-usd/tags?page=1&name=2019.9)
 
 Contains:
 * python-2.7.15
@@ -42,7 +42,7 @@ Contains:
 * hdf5-1.8.21
 * vfxplatform-2019
 
-## [aswf/ci-usd:2020.7](https://hub.docker.com/r/aswf/ci-usd/tags?page=1&name=2020.7)
+## [aswf/ci-usd:2020.8](https://hub.docker.com/r/aswf/ci-usd/tags?page=1&name=2020.8)
 
 Contains:
 * python-3.7.3
@@ -66,7 +66,7 @@ Contains:
 * hdf5-1.8.21
 * vfxplatform-2020
 
-## [aswf/ci-usd:2021.5](https://hub.docker.com/r/aswf/ci-usd/tags?page=1&name=2021.5)
+## [aswf/ci-usd:2021.6](https://hub.docker.com/r/aswf/ci-usd/tags?page=1&name=2021.6)
 
 Contains:
 * python-3.7.9
diff --git a/ci-vfxall/README.md b/ci-vfxall/README.md
index 1931e5f9..0a498a09 100644
--- a/ci-vfxall/README.md
+++ b/ci-vfxall/README.md
@@ -17,7 +17,7 @@ Contains: all supported VFX packages
 
 [Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/master/ci-vfxall/Dockerfile)
 
-## [aswf/ci-vfxall:2019-clang6.11](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2019-clang6.11)
+## [aswf/ci-vfxall:2019-clang6.12](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2019-clang6.12)
 
 Contains:
 * python-2.7.15
@@ -46,7 +46,7 @@ Contains:
 * hdf5-1.8.21
 * vfxplatform-2019
 
-## [aswf/ci-vfxall:2019-clang7.11](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2019-clang7.11)
+## [aswf/ci-vfxall:2019-clang7.12](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2019-clang7.12)
 
 Contains:
 * python-2.7.15
@@ -75,7 +75,7 @@ Contains:
 * hdf5-1.8.21
 * vfxplatform-2019
 
-## [aswf/ci-vfxall:2019-clang8.11](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2019-clang8.11)
+## [aswf/ci-vfxall:2019-clang8.12](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2019-clang8.12)
 
 Contains:
 * python-2.7.15
@@ -104,7 +104,7 @@ Contains:
 * hdf5-1.8.21
 * vfxplatform-2019
 
-## [aswf/ci-vfxall:2019-clang9.11](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2019-clang9.11)
+## [aswf/ci-vfxall:2019-clang9.12](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2019-clang9.12)
 
 Contains:
 * python-2.7.15
@@ -133,7 +133,7 @@ Contains:
 * hdf5-1.8.21
 * vfxplatform-2019
 
-## [aswf/ci-vfxall:2020-clang7.9](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2020-clang7.9)
+## [aswf/ci-vfxall:2020-clang7.10](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2020-clang7.10)
 
 Contains:
 * python-3.7.3
@@ -162,7 +162,7 @@ Contains:
 * hdf5-1.8.21
 * vfxplatform-2020
 
-## [aswf/ci-vfxall:2021-clang10.6](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2021-clang10.6)
+## [aswf/ci-vfxall:2021-clang10.7](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2021-clang10.7)
 
 Contains:
 * python-3.7.9
diff --git a/python/aswfdocker/data/versions.yaml b/python/aswfdocker/data/versions.yaml
index a12032b5..2b959909 100644
--- a/python/aswfdocker/data/versions.yaml
+++ b/python/aswfdocker/data/versions.yaml
@@ -12,7 +12,7 @@ versions:
       ASWF_CUDA_VERSION: "10.2"
       ASWF_CCACHE_VERSION: "4.0"
       ASWF_NINJA_VERSION: "1.10.1"
-      ASWF_SONAR_VERSION: "4.5.0.2216"
+      ASWF_SONAR_VERSION: "4.6.2.2472"
   "1-clang6":
     parent_versions: ["1"]
     major_version: "1"
@@ -59,7 +59,7 @@ versions:
       ASWF_CUDA_VERSION: "11.1"
       ASWF_CCACHE_VERSION: "4.0"
       ASWF_NINJA_VERSION: "1.10.1"
-      ASWF_SONAR_VERSION: "4.5.0.2216"
+      ASWF_SONAR_VERSION: "4.6.2.2472"
   "2-clang10":
     parent_versions: ["2"]
     major_version: "2"
@@ -377,71 +377,71 @@ ci-packages:
 
 ci-images:
   common:
-    - "1-clang6.7"
-    - "1-clang7.7"
-    - "1-clang8.7"
-    - "1-clang9.7"
-    - "1-clang10.7"
-    - "2-clang10.3"
-    - "2-clang11.3"
+    - "1-clang6.8"
+    - "1-clang7.8"
+    - "1-clang8.8"
+    - "1-clang9.8"
+    - "1-clang10.8"
+    - "2-clang10.4"
+    - "2-clang11.4"
   base:
-    - "2018.7"
-    - "2019.7"
-    - "2020.7"
-    - "2021.4"
+    - "2018.8"
+    - "2019.8"
+    - "2020.8"
+    - "2021.5"
   baseqt:
-    - "2018.0"
-    - "2019.0"
-    - "2020.0"
-    - "2021.1"
+    - "2018.1"
+    - "2019.1"
+    - "2020.1"
+    - "2021.2"
   openexr:
-    - "2018.7"
-    - "2019.7"
-    - "2020.7"
-    - "2021.4"
-  ocio:
     - "2018.8"
     - "2019.8"
-    - "2020.7"
+    - "2020.8"
     - "2021.5"
-  opencue:
+  ocio:
     - "2018.9"
     - "2019.9"
-    - "2020.9"
+    - "2020.8"
     - "2021.6"
+  opencue:
+    - "2019"
+    - "2020"
+    - "2021"
+    - "2021.7"
   usd:
-    - "2019.8"
-    - "2020.7"
-    - "2021.5"
+    - "2019.9"
+    - "2020.8"
+    - "2021.6"
   otio:
-    - "2019.2"
-    - "2020.2"
-    - "2021.4"
+    - "2019.3"
+    - "2020.3"
+    - "2021.5"
   osl:
-    - "2018-clang7.4"
-    - "2019-clang6.4"
-    - "2019-clang7.4"
-    - "2019-clang8.4"
-    - "2019-clang9.4"
-    - "2019-clang10.4"
-    - "2020-clang7.4"
-    - "2021-clang10.6"
-    - "2021-clang11.6"
+    - "2018-clang7.5"
+    - "2019-clang6.5"
+    - "2019-clang7.5"
+    - "2019-clang8.5"
+    - "2019-clang9.5"
+    - "2019-clang10.5"
+    - "2020-clang7.5"
+    - "2021-clang10.7"
+    - "2021-clang11.7"
   openvdb:
-    - "2018-clang7.7"
-    - "2019-clang6.7"
-    - "2019-clang7.7"
-    - "2019-clang8.7"
-    - "2019-clang9.7"
-    - "2020-clang7.7"
-    - "2021-clang10.5"
-  vfxall:
-    - "2019-clang6.11"
-    - "2019-clang7.11"
-    - "2019-clang8.11"
-    - "2019-clang9.11"
-    - "2020-clang7.9"
+    - "2018-clang7.8"
+    - "2019-clang6.8"
+    - "2019-clang7.8"
+    - "2019-clang8.8"
+    - "2019-clang9.8"
+    - "2020-clang7.8"
     - "2021-clang10.6"
+  vfxall:
+    - "2019-clang6.12"
+    - "2019-clang7.12"
+    - "2019-clang8.12"
+    - "2019-clang9.12"
+    - "2020-clang7.10"
+    - "2021-clang10.7"
 
 groups:
   package:


Test patch:
diff --git a/python/aswfdocker/tests/test_builder.py b/python/aswfdocker/tests/test_builder.py
index d255d8f2..a0df8136 100644
--- a/python/aswfdocker/tests/test_builder.py
+++ b/python/aswfdocker/tests/test_builder.py
@@ -136,7 +136,7 @@ def test_image_base_2019clang_dict(self):
                             "ASWF_PYTHON_VERSION": "2.7.15",
                             "ASWF_PYTHON_MAJOR_MINOR_VERSION": "2.7",
                             "ASWF_QT_VERSION": "5.12.6",
-                            "ASWF_SONAR_VERSION": "4.5.0.2216",
+                            "ASWF_SONAR_VERSION": "4.6.2.2472",
                             "ASWF_TBB_VERSION": "2018",
                             "ASWF_USD_VERSION": "19.11",
                             "ASWF_VFXPLATFORM_VERSION": "2019",
@@ -212,7 +212,7 @@ def test_image_base_2019_2020_dict(self):
                             "ASWF_PYTHON_VERSION": "3.7.3",
                             "ASWF_PYTHON_MAJOR_MINOR_VERSION": "3.7",
                             "ASWF_QT_VERSION": "5.12.6",
-                            "ASWF_SONAR_VERSION": "4.5.0.2216",
+                            "ASWF_SONAR_VERSION": "4.6.2.2472",
                             "ASWF_TBB_VERSION": "2019_U6",
                             "ASWF_USD_VERSION": "20.11",
                             "ASWF_VFXPLATFORM_VERSION": "2020",
@@ -266,7 +266,7 @@ def test_image_base_2019_2020_dict(self):
                             "ASWF_PYTHON_VERSION": "2.7.15",
                             "ASWF_PYTHON_MAJOR_MINOR_VERSION": "2.7",
                             "ASWF_QT_VERSION": "5.12.6",
-                            "ASWF_SONAR_VERSION": "4.5.0.2216",
+                            "ASWF_SONAR_VERSION": "4.6.2.2472",
                             "ASWF_TBB_VERSION": "2018",
                             "ASWF_USD_VERSION": "19.11",
                             "ASWF_VFXPLATFORM_VERSION": "2019",