From 9beba76c18b837d5ede7072c7ba425a8b75ff2b0 Mon Sep 17 00:00:00 2001
From: Jacob Burroughs <jburroughs@instructure.com>
Date: Tue, 20 Dec 2022 15:38:12 -0600
Subject: [PATCH] Make docker utils work with psych 4

Change-Id: I958a41f6cd2a943fe98f66012c90d01da24c51b5
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/307803
Reviewed-by: Aaron Ogata <aogata@instructure.com>
Build-Review: Aaron Ogata <aogata@instructure.com>
QA-Review: Jacob Burroughs <jburroughs@instructure.com>
Product-Review: Jacob Burroughs <jburroughs@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
---
 build/docker_utils.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/build/docker_utils.rb b/build/docker_utils.rb
index 3ff624a8d01..7e76d833faf 100644
--- a/build/docker_utils.rb
+++ b/build/docker_utils.rb
@@ -33,7 +33,11 @@ class DockerUtils
       end
 
       compose_files.inject({}) do |config, file|
-        config.merge(YAML.load_file(file), &merger)
+        if YAML::VERSION < "4.0"
+          config.merge(YAML.load_file(file), &merger)
+        else
+          config.merge(YAML.load_file(file, aliases: true), &merger)
+        end
       end
     end
   end