From 2dacce58af86e46d20bdf24458fe29bc7b8594bc Mon Sep 17 00:00:00 2001
From: Simran Spiller <simran.spiller@gmail.com>
Date: Fri, 18 Mar 2022 09:56:10 +0100
Subject: [PATCH] Docker: Update OCIO to v2.1.1 (2.1.x is VFX reference
 platform 2022)

---
 docker/README.md           | 6 +++---
 docker/ci-ocio/Dockerfile  | 4 ++--
 docker/ci-olive/Dockerfile | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker/README.md b/docker/README.md
index d70565bf7..e9ff45563 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -26,7 +26,7 @@ docker pull olivevideoeditor/ci-common:2
 docker pull olivevideoeditor/ci-package-otio
 docker pull olivevideoeditor/ci-package-crashpad
 docker pull olivevideoeditor/ci-package-ffmpeg:4.2.4
-docker pull olivevideoeditor/ci-package-ocio:2021-2.0.0
+docker pull olivevideoeditor/ci-package-ocio:2022-2.1.1
 docker pull olivevideoeditor/ci-olive:2021.4
 ```
 
@@ -49,7 +49,7 @@ docker build -t olivevideoeditor/ci-common:2 -f ci-common/Dockerfile .
 docker build -t olivevideoeditor/ci-package-otio -f ci-otio/Dockerfile .
 docker build -t olivevideoeditor/ci-package-crashpad -f ci-crashpad/Dockerfile .
 docker build -t olivevideoeditor/ci-package-ffmpeg:4.2.4 -f ci-ffmpeg/Dockerfile .
-docker build -t olivevideoeditor/ci-package-ocio:2021-2.0.0 -f ci-ocio/Dockerfile .
+docker build -t olivevideoeditor/ci-package-ocio:2022-2.1.1 -f ci-ocio/Dockerfile .
 docker build -t olivevideoeditor/ci-olive:2021.4 -f ci-olive/Dockerfile .
 ```
 
@@ -64,6 +64,6 @@ docker push olivevideoeditor/ci-common:2
 docker push olivevideoeditor/ci-package-otio
 docker push olivevideoeditor/ci-package-crashpad
 docker push olivevideoeditor/ci-package-ffmpeg:4.2.4
-docker push olivevideoeditor/ci-package-ocio:2021-2.0.0
+docker push olivevideoeditor/ci-package-ocio:2022-2.1.1
 docker push olivevideoeditor/ci-olive:2021.4
 ```
diff --git a/docker/ci-ocio/Dockerfile b/docker/ci-ocio/Dockerfile
index 9aa60d565..0727821bd 100644
--- a/docker/ci-ocio/Dockerfile
+++ b/docker/ci-ocio/Dockerfile
@@ -2,14 +2,14 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # Build image (default):
-#  docker build -t olivevideoeditor/ci-package-ocio:2021-2.0.0 -f ci-ocio/Dockerfile .
+#  docker build -t olivevideoeditor/ci-package-ocio:2022-2.1.1 -f ci-ocio/Dockerfile .
 
 ARG OLIVE_ORG=olivevideoeditor
 ARG ASWF_PKG_ORG=aswftesting
 ARG CI_COMMON_VERSION=2
 ARG VFXPLATFORM_VERSION=2021
 # OCIO repo branch or tag name
-ARG OCIO_VERSION=v2.1.0
+ARG OCIO_VERSION=v2.1.1
 # Latest configs ~3 GB because of ACES 1.0.x.
 # Upstream only copies nuke-default, therefore we also use the older configs.
 ARG OCIO_CONFIGS_VERSION=1.0_r2
diff --git a/docker/ci-olive/Dockerfile b/docker/ci-olive/Dockerfile
index ffdfd6ebd..3b0ff3166 100644
--- a/docker/ci-olive/Dockerfile
+++ b/docker/ci-olive/Dockerfile
@@ -12,7 +12,7 @@ ARG OLIVE_ORG=olivevideoeditor
 ARG ASWF_PKG_ORG=aswftesting
 ARG CI_COMMON_VERSION=2
 ARG VFXPLATFORM_VERSION=2021
-ARG OCIO_VERSION=2.1.0
+ARG OCIO_VERSION=2.1.1
 ARG FFMPEG_VERSION=4.2.4
 
 FROM ${ASWF_PKG_ORG}/ci-package-qt:${VFXPLATFORM_VERSION} as ci-package-qt